diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/emacs/elisp-packages')
6 files changed, 58 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index ff5cce83103e..60c257e365ce 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -64,6 +64,10 @@ self: let ''; }); + pq = super.pq.overrideAttrs (old: { + buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.postgresql ]; + }); + xeft = super.xeft.overrideAttrs (old: let libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary; in { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 84c991ad17c2..2a6cb016cdc8 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -98,7 +98,7 @@ self: let ''; postInstall = (old.postInstall or "") + "\n" + '' - ./install.sh --prefix=$out + ./install.sh "$out" ''; meta = old.meta // { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 117adcd47a9c..d53ee7056a89 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -93,6 +93,8 @@ in wat-mode = callPackage ./manual-packages/wat-mode { }; + xapian-lite = callPackage ./manual-packages/xapian-lite { }; + yes-no = callPackage ./manual-packages/yes-no { }; youtube-dl = callPackage ./manual-packages/youtube-dl { }; diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix index 26f9e25ad665..02fec5ef7f72 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix @@ -7,7 +7,7 @@ trivialBuild { inherit (llvmPackages.llvm) src version; postUnpack = '' - sourceRoot="$sourceRoot/utils/emacs" + sourceRoot="$sourceRoot/llvm/utils/emacs" ''; meta = { diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix new file mode 100644 index 000000000000..67b5a96ee9c0 --- /dev/null +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, emacs, fetchFromSourcehut, xapian }: + +stdenv.mkDerivation (finalAttrs: { + pname = "xapian-lite"; + version = "2.0.0"; + + src = fetchFromSourcehut { + owner = "~casouri"; + repo = "xapian-lite"; + rev = "v${finalAttrs.version}"; + hash = "sha256-uFO5yxPHIUJjT3OV2hZKp7KgT3l73W95X2SAz6vhCpI="; + domain = "sr.ht"; + }; + + preBuild = '' + rm emacs-module.h + ''; + + buildInputs = [ xapian emacs ]; + + installPhase = '' + runHook preInstall + + install -Dm444 -t $out/share/emacs/site-lisp/ xapian-lite${stdenv.targetPlatform.extensions.sharedLibrary} + + runHook postInstall + ''; + + meta = { + homepage = "https://git.sr.ht/~casouri/xapian-lite"; + description = "A minimal Emacs dynamic module for Xapian"; + maintainers = [ lib.maintainers.marsam ]; + license = lib.licenses.gpl3Plus; + inherit (emacs.meta) platforms; + }; +}) diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index cd45cfc78727..3c8f89bd44d6 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -281,6 +281,20 @@ let packageRequires = [ self.haskell-mode ]; }); + hotfuzz = super.hotfuzz.overrideAttrs (old: { + nativeBuildInputs = (old.nativeBuildInputs or [ ]) ++ [ pkgs.cmake ]; + + dontUseCmakeBuildDir = true; + + preBuild = '' + make -j$NIX_BUILD_CORES + ''; + + postInstall = (old.postInstall or "") + "\n" + '' + install source/hotfuzz-module.so $out/share/emacs/site-lisp/elpa/hotfuzz-* + ''; + }); + irony = super.irony.overrideAttrs (old: { cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; env.NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR"; |