public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emacsPackagesFor: Remove all pkgs inherits from call site

Browse Source
This commit is contained in:
adisbladis 2021-02-24 15:01:08 +01:00
parent b673be8336
commit c68c81fb01
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/top-level/all-packages.nix
View File

@ -21947,12 +21947,7 @@ in
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
}; };
emacsPackagesFor = emacs: import ./emacs-packages.nix { emacsPackagesFor = emacs: import ./emacs-packages.nix { inherit pkgs lib emacs; };
inherit lib newScope stdenv pkgs;
inherit fetchFromGitHub fetchurl;
inherit emacs texinfo makeWrapper runCommand writeText;
inherit (xorg) lndir;
};
inherit (gnome3) empathy; inherit (gnome3) empathy;

15
pkgs/top-level/emacs-packages.nix
View File

@ -32,12 +32,7 @@
# `meta` with `platforms` and `homepage` set to something you are # `meta` with `platforms` and `homepage` set to something you are
# unlikely to want to override for most packages # unlikely to want to override for most packages
{ lib, newScope, stdenv, fetchurl, fetchFromGitHub, runCommand, writeText { pkgs, lib ? pkgs.lib, emacs }:
, emacs, texinfo, lndir, makeWrapper
, pkgs
}:
let let
@ -50,7 +45,8 @@ let
}; };
mkElpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix { mkElpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix {
inherit lib stdenv texinfo writeText; inherit (pkgs) stdenv texinfo writeText;
inherit lib;
}; };
# Contains both melpa stable & unstable # Contains both melpa stable & unstable
@ -65,14 +61,15 @@ let
}; };
emacsWithPackages = import ../build-support/emacs/wrapper.nix { emacsWithPackages = import ../build-support/emacs/wrapper.nix {
inherit lib lndir makeWrapper runCommand; inherit (pkgs) lndir makeWrapper runCommand;
inherit lib;
}; };
mkManualPackages = import ../applications/editors/emacs-modes/manual-packages.nix { mkManualPackages = import ../applications/editors/emacs-modes/manual-packages.nix {
inherit lib pkgs; inherit lib pkgs;
}; };
in lib.makeScope newScope (self: lib.makeOverridable ({ in lib.makeScope pkgs.newScope (self: lib.makeOverridable ({
elpaPackages ? mkElpaPackages self elpaPackages ? mkElpaPackages self
, melpaStablePackages ? mkMelpaStablePackages self , melpaStablePackages ? mkMelpaStablePackages self
, melpaPackages ? mkMelpaPackages self , melpaPackages ? mkMelpaPackages self