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

emacs-packages: Make pkgs & lib overrideable

Browse Source 
With these changes it's possible to override pkgs & lib by:
```
emacs.pkgs.override { pkgs = fooPkgs; }
```
and get them to coherently apply to all emacs packages.
This commit is contained in:
adisbladis 2021-02-24 15:25:48 +01:00
parent c68c81fb01
commit 2b84cf6e18
No known key found for this signature in database
GPG Key ID: 110BFAD44C6249B7
2 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21947,7 +21947,11 @@ 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 { inherit pkgs lib emacs; }; emacsPackagesFor = emacs: import ./emacs-packages.nix {
inherit (lib) makeScope makeOverridable;
inherit emacs;
pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set
};
inherit (gnome3) empathy; inherit (gnome3) empathy;

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

@ -32,49 +32,42 @@
# `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
{ pkgs, lib ? pkgs.lib, emacs }: { pkgs', makeScope, makeOverridable, emacs }:
let let
trivialBuild = pkgs.callPackage ../build-support/emacs/trivial.nix { mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs-modes/elpa-packages.nix {
inherit emacs;
};
melpaBuild = pkgs.callPackage ../build-support/emacs/melpa.nix {
inherit emacs;
};
mkElpaPackages = import ../applications/editors/emacs-modes/elpa-packages.nix {
inherit (pkgs) stdenv texinfo writeText; inherit (pkgs) stdenv texinfo writeText;
inherit lib; inherit lib;
}; };
# Contains both melpa stable & unstable # Contains both melpa stable & unstable
melpaGeneric = import ../applications/editors/emacs-modes/melpa-packages.nix { melpaGeneric = { pkgs, lib }: import ../applications/editors/emacs-modes/melpa-packages.nix {
inherit lib pkgs;
};
mkMelpaStablePackages = melpaGeneric "stable";
mkMelpaPackages = melpaGeneric "unstable";
mkOrgPackages = import ../applications/editors/emacs-modes/org-packages.nix {
inherit lib;
};
emacsWithPackages = import ../build-support/emacs/wrapper.nix {
inherit (pkgs) lndir makeWrapper runCommand;
inherit lib;
};
mkManualPackages = import ../applications/editors/emacs-modes/manual-packages.nix {
inherit lib pkgs; inherit lib pkgs;
}; };
in lib.makeScope pkgs.newScope (self: lib.makeOverridable ({ mkOrgPackages = { lib }: import ../applications/editors/emacs-modes/org-packages.nix {
elpaPackages ? mkElpaPackages self inherit lib;
, melpaStablePackages ? mkMelpaStablePackages self };
, melpaPackages ? mkMelpaPackages self
, orgPackages ? mkOrgPackages self mkManualPackages = { pkgs, lib }: import ../applications/editors/emacs-modes/manual-packages.nix {
, manualPackages ? mkManualPackages self inherit lib pkgs;
};
emacsWithPackages = { pkgs, lib }: import ../build-support/emacs/wrapper.nix {
inherit (pkgs) makeWrapper runCommand;
inherit (pkgs.xorg) lndir;
inherit lib;
};
in makeScope pkgs'.newScope (self: makeOverridable ({
pkgs ? pkgs'
, lib ? pkgs.lib
, elpaPackages ? mkElpaPackages { inherit pkgs lib; } self
, melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self
, melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self
, orgPackages ? mkOrgPackages { inherit lib; } self
, manualPackages ? mkManualPackages { inherit pkgs lib; } self
}: ({} }: ({}
// elpaPackages // { inherit elpaPackages; } // elpaPackages // { inherit elpaPackages; }
// melpaStablePackages // { inherit melpaStablePackages; } // melpaStablePackages // { inherit melpaStablePackages; }
@ -82,8 +75,18 @@ in lib.makeScope pkgs.newScope (self: lib.makeOverridable ({
// orgPackages // { inherit orgPackages; } // orgPackages // { inherit orgPackages; }
// manualPackages // { inherit manualPackages; } // manualPackages // { inherit manualPackages; }
// { // {
inherit emacs melpaBuild trivialBuild;
emacsWithPackages = emacsWithPackages self; inherit emacs;
withPackages = emacsWithPackages self;
trivialBuild = pkgs.callPackage ../build-support/emacs/trivial.nix {
inherit (self) emacs;
};
melpaBuild = pkgs.callPackage ../build-support/emacs/melpa.nix {
inherit (self) emacs;
};
emacsWithPackages = emacsWithPackages { inherit pkgs lib; } self;
withPackages = emacsWithPackages { inherit pkgs lib; } self;
}) })
) {}) ) {})