Unverified Commit 8372b522 authored by adisbladis's avatar adisbladis Committed by GitHub
Browse files

Merge pull request #132566 from adisbladis/emacs-manual-pkgs-fixes 

Emacs manually packaged build fixes
parents a63d57e0 03bb707c

pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix

+2 −4
Original line number Diff line number Diff line 
{ fetchurl, lib, melpaBuild, writeText }:

{ fetchurl, lib, trivialBuild, writeText }:



melpaBuild {

trivialBuild {

  pname = "font-lock+";

  version = "20180101.25";
@@ -10,8 +10,6 @@ melpaBuild { 
    name = "font-lock+.el";

  };



  recipe = writeText "recipe" "(font-lock+ :fetcher github :repo \"\")";



  meta = {

    homepage = "https://melpa.org/#/font-lock+";

    license = lib.licenses.gpl2Plus;

pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix

+30 −13
Original line number Diff line number Diff line 
{ lib, pkgs }: self: with self; with lib.licenses; {



  elisp-ffi = melpaBuild rec {

  elisp-ffi = let

    rev = "da37c516a0e59bdce63fb2dc006a231dee62a1d9";

  in melpaBuild {

    pname = "elisp-ffi";

    version = "1.0.0";

    version = "20170518.0";



    commit = rev;



    src = pkgs.fetchFromGitHub {

      owner = "skeeto";

      repo = "elisp-ffi";

      rev = version;

      sha256 = "0z2n3h5l5fj8wl8i1ilfzv11l3zba14sgph6gz7dx7q12cnp9j22";

      inherit rev;

      sha256 = "sha256-StOezQEnNTjRmjY02ub5FRh59aL6gWfw+qgboz0wF94=";

    };



    nativeBuildInputs = [ pkgs.pkg-config ];



    buildInputs = [ pkgs.libffi ];



    preBuild = "make";

    preBuild = ''

      mv ffi.el elisp-ffi.el

      make

    '';



    recipe = pkgs.writeText "recipe" ''

      (elisp-ffi

      :repo "skeeto/elisp-ffi"

      :fetcher github

      :files ("ffi-glue" "ffi.el"))

      :fetcher github)

    '';



    meta = {
@@ -94,19 +102,23 @@ 


  git-undo = callPackage ./git-undo { };



  haskell-unicode-input-method = melpaBuild {

    pname = "emacs-haskell-unicode-input-method";

  haskell-unicode-input-method = let

    rev = "d8d168148c187ed19350bb7a1a190217c2915a63";

  in melpaBuild {

    pname = "haskell-unicode-input-method";

    version = "20110905.2307";



    commit = rev;



    src = pkgs.fetchFromGitHub {

      owner = "roelvandijk";

      repo = "emacs-haskell-unicode-input-method";

      rev = "d8d168148c187ed19350bb7a1a190217c2915a63";

      inherit rev;

      sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78";

    };



    recipe = pkgs.writeText "recipe" ''

      (emacs-haskell-unicode-input-method

      (haskell-unicode-input-method

       :repo "roelvandijk/emacs-haskell-unicode-input-method"

       :fetcher github)

    '';
@@ -134,14 +146,19 @@ 
    };

  };



  matrix-client = melpaBuild {

  matrix-client = let

    rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed";

  in melpaBuild

  {

    pname = "matrix-client";

    version = "0.3.0";



    commit = rev;



    src = pkgs.fetchFromGitHub {

      owner = "alphapapa";

      repo = "matrix-client.el";

      rev = "d2ac55293c96d4c95971ed8e2a3f6f354565c5ed";

      inherit rev;

      sha256 = "1scfv1502yg7x4bsl253cpr6plml1j4d437vci2ggs764sh3rcqq";

    };

pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix

+0 −8
Original line number Diff line number Diff line
@@ -325,14 +325,6 @@ let 
          buildInputs = old.buildInputs ++ [ pkgs.tdlib ];

          nativeBuildInputs = [ pkgs.pkg-config ];



          patches = [

            (pkgs.fetchpatch {

              name = "telega-server-bin-store-prefer.patch";

              url = "https://github.com/zevlg/telega.el/commit/72550f984ca869309d197203ef7de99182d71729.patch";

              sha256 = "18xvz53bygksak6h5f8cz79y83p2va15i8qz7n4s3g9gsklmkj2p";

            })

          ];



          postPatch = ''

            substituteInPlace telega-customize.el \

              --replace 'defcustom telega-server-command "telega-server"' \