MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

all-packages.nix: rename emacs functions Gen -> For

Browse source 
This was introduced when it was unclear which suffix was better, but now it's
clear that the "For" convention won.
This commit is contained in:
Jan Malakhovski 2018-08-18 17:59:02 +00:00
parent 281a629c2a
commit 1ee3c294bf
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/top-level/aliases.nix
View file

@ -81,6 +81,8 @@ mapAliases ({
dwarf_fortress = dwarf-fortress; # added 2016-01-23
emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25
emacsMelpa = emacs25PackagesNg; # for backward compatibility
emacsPackagesGen = emacsPackagesFor; # added 2018-08-18
emacsPackagesNgGen = emacsPackagesNgFor; # added 2018-08-18
enblendenfuse = enblend-enfuse; # 2015-09-30
evolution_data_server = evolution-data-server; # added 2018-02-25
etcdctl = etcd; # added 2018-04-25

12
pkgs/top-level/all-packages.nix
View file

@ -16022,7 +16022,7 @@ with pkgs;
ImageCaptureCore GSS ImageIO;
};
emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec {
inherit emacs;
autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { };
@ -16165,10 +16165,10 @@ with pkgs;
cask = callPackage ../applications/editors/emacs-modes/cask { };
};
emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages;
emacs26Packages = emacsPackagesGen emacs26 pkgs.emacs26Packages;
emacs25Packages = emacsPackagesFor emacs25 pkgs.emacs25Packages;
emacs26Packages = emacsPackagesFor emacs26 pkgs.emacs26Packages;
emacsPackagesNgGen = emacs: import ./emacs-packages.nix {
emacsPackagesNgFor = emacs: import ./emacs-packages.nix {
inherit lib newScope stdenv;
inherit fetchFromGitHub fetchgit fetchhg fetchurl fetchpatch;
inherit emacs texinfo makeWrapper runCommand writeText;
@ -16190,9 +16190,9 @@ with pkgs;
};
};
emacs25PackagesNg = emacsPackagesNgGen emacs25;
emacs25PackagesNg = emacsPackagesNgFor emacs25;
emacs25WithPackages = emacs25PackagesNg.emacsWithPackages;
emacs26PackagesNg = emacsPackagesNgGen emacs26;
emacs26PackagesNg = emacsPackagesNgFor emacs26;
emacs26WithPackages = emacs26PackagesNg.emacsWithPackages;
emacsWithPackages = emacsPackagesNg.emacsWithPackages;