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

Merge pull request #330763 from linj-fork/pr/move-elpaBuild 

emacs: move elpaBuild together with other builders
parents 46a2e084 dfac396c

pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix

+2 −7
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ formats commits for you. 


*/



{ lib, stdenv, texinfo, writeText, gcc, pkgs, buildPackages }:

{ lib, pkgs, buildPackages }:



self: let
@@ -32,11 +32,6 @@ self: let 
    });

  };



  elpaBuild = import ../build-support/elpa.nix {

    inherit lib stdenv texinfo writeText gcc;

    inherit (self) emacs;

  };



  # Use custom elpa url fetcher with fallback/uncompress

  fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
@@ -99,6 +94,6 @@ self: let 


    elpaDevelPackages = super // overrides;



  in elpaDevelPackages // { inherit elpaBuild; });

  in elpaDevelPackages);



in generateElpa { }

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

+2 −7
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ formats commits for you. 


*/



{ lib, stdenv, texinfo, writeText, gcc, pkgs, buildPackages }:

{ lib, pkgs, buildPackages }:



self: let
@@ -32,11 +32,6 @@ self: let 
    });

  };



  elpaBuild = import ../build-support/elpa.nix {

    inherit lib stdenv texinfo writeText gcc;

    inherit (self) emacs;

  };



  # Use custom elpa url fetcher with fallback/uncompress

  fetchurl = buildPackages.callPackage ./fetchelpa.nix { };
@@ -188,7 +183,7 @@ self: let 


    elpaPackages = super // overrides;



  in elpaPackages // { inherit elpaBuild; });

  in elpaPackages);



in

generateElpa { }

pkgs/top-level/emacs-packages.nix

+6 −2
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ 
let



  mkElpaDevelPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-devel-packages.nix {

    inherit (pkgs) stdenv texinfo writeText gcc pkgs buildPackages;

    inherit (pkgs) pkgs buildPackages;

    inherit lib;

  };



  mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-packages.nix {

    inherit (pkgs) stdenv texinfo writeText gcc pkgs buildPackages;

    inherit (pkgs) pkgs buildPackages;

    inherit lib;

  };
@@ -81,6 +81,10 @@ in makeScope pkgs'.newScope (self: makeOverridable ({ 
      inherit (self) emacs;

    };



    elpaBuild = pkgs.callPackage ../applications/editors/emacs/build-support/elpa.nix {

      inherit (self) emacs;

    };



    melpaBuild = pkgs.callPackage ../applications/editors/emacs/build-support/melpa.nix {

      inherit (self) emacs;

    };