mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
b2c8626d61
The current algorithm creates attributes with null values for packages with no source in a variant of MELPA. Though will satify dependencies they produce no files, and though a build that transitively depends on one them will be successful, Emacs won't find them and any code depending on them won't work. The solution with minimal code change would have been filtering the list of results from melpaDerivation by comparing the value against null, but that leads to an infinite recursion. This commit also moves legacy renames from the shared to the unstable set, as the corresponding null value elements won't exist in the stable set anymore. The test used for the problem was: $ nix-build --show-trace ./default.nix -A emacs26Packages.melpaStablePackages.findr error: expression does not evaluate to a derivation (or a set or list of those) The expected output, obtained with this commit is: $ nix-build --show-trace ./default.nix -A emacs26Packages.melpaStablePackages.findr error: attribute 'findr' in selection path 'emacs26Packages.melpaStablePackages.findr' not found
437 lines
14 KiB
Nix
437 lines
14 KiB
Nix
/*
|
|
|
|
# Updating
|
|
|
|
To update the list of packages from MELPA,
|
|
|
|
1. Run ./update-melpa
|
|
2. Check for evaluation errors:
|
|
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages
|
|
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages
|
|
3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json`
|
|
|
|
*/
|
|
|
|
{ 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 = rec {
|
|
shared = rec {
|
|
# Expects bash to be at /bin/bash
|
|
ac-rtags = fix-rtags super.ac-rtags;
|
|
|
|
airline-themes = super.airline-themes.override {
|
|
inherit (self.melpaPackages) powerline;
|
|
};
|
|
|
|
auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs(old: {
|
|
buildInputs = old.buildInputs ++ [ external.llvmPackages.llvm ];
|
|
CFLAGS = "-I${external.llvmPackages.clang}/include";
|
|
LDFLAGS = "-L${external.llvmPackages.clang}/lib";
|
|
});
|
|
emacsClangCompleteAsync = auto-complete-clang-async;
|
|
|
|
# part of a larger package
|
|
caml = dontConfigure super.caml;
|
|
|
|
# part of a larger package
|
|
# upstream issue: missing package version
|
|
cmake-mode = dontConfigure super.cmake-mode;
|
|
|
|
company-rtags = fix-rtags super.company-rtags;
|
|
|
|
easy-kill-extras = super.easy-kill-extras.override {
|
|
inherit (self.melpaPackages) easy-kill;
|
|
};
|
|
|
|
emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: {
|
|
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" ];
|
|
});
|
|
|
|
# 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 ];
|
|
});
|
|
|
|
evil-magit = super.evil-magit.overrideAttrs (attrs: {
|
|
# searches for Git at build time
|
|
nativeBuildInputs =
|
|
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
|
});
|
|
|
|
ess-R-data-view = super.ess-R-data-view.override {
|
|
inherit (self.melpaPackages) ess ctable popup;
|
|
};
|
|
|
|
flycheck-rtags = fix-rtags super.flycheck-rtags;
|
|
|
|
gnuplot = super.gnuplot.overrideAttrs (old: {
|
|
nativeBuildInputs =
|
|
(old.nativeBuildInputs or []) ++ [ pkgs.autoreconfHook ];
|
|
});
|
|
|
|
pdf-tools = super.pdf-tools.overrideAttrs(old: {
|
|
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"))
|
|
'';
|
|
});
|
|
|
|
# Build same version as Haskell package
|
|
hindent = (externalSrc super.hindent external.hindent).overrideAttrs (attrs: {
|
|
packageRequires = [ self.haskell-mode ];
|
|
});
|
|
|
|
irony = super.irony.overrideAttrs (old: {
|
|
cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ];
|
|
NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR";
|
|
preConfigure = ''
|
|
cd server
|
|
'';
|
|
preBuild = ''
|
|
make
|
|
install -D bin/irony-server $out/bin/irony-server
|
|
cd ..
|
|
'';
|
|
checkPhase = ''
|
|
cd source/server
|
|
make check
|
|
cd ../..
|
|
'';
|
|
preFixup = ''
|
|
rm -rf $out/share/emacs/site-lisp/elpa/*/server
|
|
'';
|
|
dontUseCmakeBuildDir = true;
|
|
doCheck = true;
|
|
packageRequires = [ self.emacs ];
|
|
nativeBuildInputs = [ external.cmake external.llvmPackages.llvm external.llvmPackages.clang ];
|
|
});
|
|
|
|
# tries to write a log file to $HOME
|
|
insert-shebang = super.insert-shebang.overrideAttrs (attrs: {
|
|
HOME = "/tmp";
|
|
});
|
|
|
|
ivy-rtags = fix-rtags super.ivy-rtags;
|
|
|
|
magit = super.magit.overrideAttrs (attrs: {
|
|
# searches for Git at build time
|
|
nativeBuildInputs =
|
|
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
|
});
|
|
|
|
magit-annex = super.magit-annex.overrideAttrs (attrs: {
|
|
# searches for Git at build time
|
|
nativeBuildInputs =
|
|
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
|
});
|
|
|
|
magit-todos = super.magit-todos.overrideAttrs (attrs: {
|
|
# searches for Git at build time
|
|
nativeBuildInputs =
|
|
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
|
});
|
|
|
|
magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: {
|
|
# searches for Git at build time
|
|
nativeBuildInputs =
|
|
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
|
});
|
|
|
|
magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: {
|
|
# searches for Git at build time
|
|
nativeBuildInputs =
|
|
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
|
});
|
|
|
|
magithub = super.magithub.overrideAttrs (attrs: {
|
|
# searches for Git at build time
|
|
nativeBuildInputs =
|
|
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
|
});
|
|
|
|
magit-svn = super.magit-svn.overrideAttrs (attrs: {
|
|
# searches for Git at build time
|
|
nativeBuildInputs =
|
|
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
|
});
|
|
|
|
kubernetes = super.kubernetes.overrideAttrs (attrs: {
|
|
# searches for Git at build time
|
|
nativeBuildInputs =
|
|
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
|
});
|
|
|
|
# upstream issue: missing file header
|
|
mhc = super.mhc.override {
|
|
inherit (self.melpaPackages) calfw;
|
|
};
|
|
|
|
# missing .NET
|
|
nemerle = markBroken super.nemerle;
|
|
|
|
# part of a larger package
|
|
notmuch = dontConfigure super.notmuch;
|
|
|
|
rtags = dontConfigure (externalSrc super.rtags external.rtags);
|
|
|
|
shm = super.shm.overrideAttrs (attrs: {
|
|
propagatedUserEnvPkgs = [ external.structured-haskell-mode ];
|
|
});
|
|
|
|
# Telega has a server portion for it's network protocol
|
|
telega = super.telega.overrideAttrs(old: {
|
|
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
|
|
'';
|
|
});
|
|
|
|
vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: {
|
|
nativeBuildInputs =
|
|
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
|
});
|
|
|
|
zmq = super.zmq.overrideAttrs(old: {
|
|
stripDebugList = [ "share" ];
|
|
preBuild = ''
|
|
make
|
|
'';
|
|
nativeBuildInputs = [
|
|
external.autoconf external.automake external.pkgconfig external.libtool
|
|
(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
|
|
'';
|
|
});
|
|
|
|
# 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+";
|
|
};
|
|
|
|
stable = shared // {
|
|
|
|
# upstream issue: missing file header
|
|
bufshow = markBroken super.bufshow;
|
|
|
|
# upstream issue: missing file header
|
|
connection = markBroken super.connection;
|
|
|
|
# upstream issue: missing file header
|
|
dictionary = markBroken super.dictionary;
|
|
|
|
# missing git
|
|
egg = markBroken super.egg;
|
|
|
|
# upstream issue: missing file header
|
|
elmine = markBroken super.elmine;
|
|
|
|
# upstream issue: missing file header
|
|
ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
|
|
|
|
# upstream issue: missing file header
|
|
initsplit = markBroken super.initsplit;
|
|
|
|
# upstream issue: missing file header
|
|
jsfmt = markBroken super.jsfmt;
|
|
|
|
# upstream issue: missing file header
|
|
maxframe = markBroken super.maxframe;
|
|
|
|
# upstream issue: doesn't build
|
|
eterm-256color = markBroken super.eterm-256color;
|
|
|
|
helm-rtags = fix-rtags super.helm-rtags;
|
|
|
|
# upstream issue: missing file header
|
|
qiita = markBroken super.qiita;
|
|
|
|
# upstream issue: missing file header
|
|
speech-tagger = markBroken super.speech-tagger;
|
|
|
|
# upstream issue: missing file header
|
|
textmate = markBroken super.textmate;
|
|
|
|
# upstream issue: missing file header
|
|
link = markBroken super.link;
|
|
|
|
# upstream issue: missing file header
|
|
voca-builder = markBroken super.voca-builder;
|
|
|
|
# upstream issue: missing file header
|
|
window-numbering = markBroken super.window-numbering;
|
|
|
|
};
|
|
|
|
unstable = shared // {
|
|
editorconfig = super.editorconfig.overrideAttrs (attrs: {
|
|
propagatedUserEnvPkgs = [ external.editorconfig-core-c ];
|
|
});
|
|
|
|
egg = super.egg.overrideAttrs (attrs: {
|
|
# searches for Git at build time
|
|
nativeBuildInputs =
|
|
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
|
});
|
|
|
|
# missing dependencies
|
|
evil-search-highlight-persist = super.evil-search-highlight-persist.overrideAttrs (attrs: {
|
|
packageRequires = with self; [ evil highlight ];
|
|
});
|
|
|
|
forge = super.forge.overrideAttrs (attrs: {
|
|
# searches for Git at build time
|
|
nativeBuildInputs =
|
|
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
|
});
|
|
|
|
helm-rtags = fix-rtags super.helm-rtags;
|
|
|
|
orgit =
|
|
(super.orgit.overrideAttrs (attrs: {
|
|
# searches for Git at build time
|
|
nativeBuildInputs =
|
|
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
|
}));
|
|
|
|
# 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;
|
|
};
|
|
|
|
treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: {
|
|
# searches for Git at build time
|
|
nativeBuildInputs =
|
|
(attrs.nativeBuildInputs or []) ++ [ external.git ];
|
|
});
|
|
|
|
vterm = super.vterm.overrideAttrs(old: {
|
|
buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ];
|
|
cmakeFlags = [
|
|
"-DEMACS_SOURCE=${self.emacs.src}"
|
|
"-DUSE_SYSTEM_LIBVTERM=ON"
|
|
];
|
|
# 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}
|
|
'';
|
|
});
|
|
# Legacy alias
|
|
emacs-libvterm = unstable.vterm;
|
|
|
|
# Map legacy renames from emacs2nix since code generation was ported to emacs lisp
|
|
_0xc = super."0xc";
|
|
_2048-game = super."2048-game";
|
|
_4clojure = super."4clojure";
|
|
at = super."@";
|
|
term-plus = super."term+";
|
|
term-plus-key-intercept = super."term+key-intercept";
|
|
term-plus-mux = super."term+mux";
|
|
xml-plus = super."xml+";
|
|
|
|
w3m = super.w3m.override (args: {
|
|
melpaBuild = drv: args.melpaBuild (drv // {
|
|
prePatch =
|
|
let w3m = "${lib.getBin external.w3m}/bin/w3m"; in ''
|
|
substituteInPlace w3m.el \
|
|
--replace 'defcustom w3m-command nil' \
|
|
'defcustom w3m-command "${w3m}"'
|
|
'';
|
|
});
|
|
});
|
|
};
|
|
};
|
|
|
|
in super // overrides.${variant});
|
|
|
|
in generateMelpa { }
|