From 65e533431acd89473c58386b4e30013fab835a16 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Sun, 8 Mar 2020 23:17:01 +0000
Subject: refactor: emacsPackagesNg -> emacsPackages

The former is now just an alias for the latter anyways.
---
 overrides/writeElispBin/default.nix        | 4 ++--
 third_party/default.nix                    | 4 ++--
 third_party/emacs/carp-mode.nix            | 2 +-
 third_party/emacs/rcirc/default.nix        | 2 +-
 tools/emacs-pkgs/dottime/default.nix       | 2 +-
 tools/emacs-pkgs/nix-util/default.nix      | 2 +-
 tools/emacs-pkgs/term-switcher/default.nix | 2 +-
 tools/emacs/default.nix                    | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/overrides/writeElispBin/default.nix b/overrides/writeElispBin/default.nix
index 8fd61f3948..f2c81a2c02 100644
--- a/overrides/writeElispBin/default.nix
+++ b/overrides/writeElispBin/default.nix
@@ -3,10 +3,10 @@
 { name, src, deps ? (_: []), emacs ? pkgs.emacs26-nox }:
 
 let
-  inherit (pkgs) emacsPackagesNg emacsPackagesNgGen writeTextFile;
+  inherit (pkgs) emacsPackages emacsPackagesGen writeTextFile;
   inherit (builtins) isString toFile;
 
-  finalEmacs = (emacsPackagesNgGen emacs).emacsWithPackages deps;
+  finalEmacs = (emacsPackagesGen emacs).emacsWithPackages deps;
 
   srcFile = if isString src
     then toFile "${name}.el" src
diff --git a/third_party/default.nix b/third_party/default.nix
index c9c95367b3..69b5de38c8 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -39,8 +39,8 @@ let
       dockerTools
       emacs26
       emacs26-nox
-      emacsPackagesNg
-      emacsPackagesNgGen
+      emacsPackages
+      emacsPackagesGen
       fetchFromGitHub
       fetchurl
       fetchzip
diff --git a/third_party/emacs/carp-mode.nix b/third_party/emacs/carp-mode.nix
index 9fab1f8663..0ddf136542 100644
--- a/third_party/emacs/carp-mode.nix
+++ b/third_party/emacs/carp-mode.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 with pkgs;
-with emacsPackagesNg;
+with emacsPackages;
 
 melpaBuild rec {
   pname = "carp-mode";
diff --git a/third_party/emacs/rcirc/default.nix b/third_party/emacs/rcirc/default.nix
index a03ccfcaa3..9d22c7cd86 100644
--- a/third_party/emacs/rcirc/default.nix
+++ b/third_party/emacs/rcirc/default.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-pkgs.emacsPackagesNg.trivialBuild rec {
+pkgs.emacsPackages.trivialBuild rec {
   pname = "rcirc";
   version = "1";
   src = ./rcirc.el;
diff --git a/tools/emacs-pkgs/dottime/default.nix b/tools/emacs-pkgs/dottime/default.nix
index 97b5581070..633aad187e 100644
--- a/tools/emacs-pkgs/dottime/default.nix
+++ b/tools/emacs-pkgs/dottime/default.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-pkgs.emacsPackagesNg.trivialBuild rec {
+pkgs.emacsPackages.trivialBuild rec {
   pname = "dottime";
   version = "1.0";
   src = ./dottime.el;
diff --git a/tools/emacs-pkgs/nix-util/default.nix b/tools/emacs-pkgs/nix-util/default.nix
index 57c18cf8d7..2356ad75f2 100644
--- a/tools/emacs-pkgs/nix-util/default.nix
+++ b/tools/emacs-pkgs/nix-util/default.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-pkgs.emacsPackagesNg.trivialBuild rec {
+pkgs.emacsPackages.trivialBuild rec {
   pname = "nix-util";
   version = "1.0";
   src = ./nix-util.el;
diff --git a/tools/emacs-pkgs/term-switcher/default.nix b/tools/emacs-pkgs/term-switcher/default.nix
index b1f1a47861..0c5e4c17cd 100644
--- a/tools/emacs-pkgs/term-switcher/default.nix
+++ b/tools/emacs-pkgs/term-switcher/default.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-with pkgs.emacsPackagesNg;
+with pkgs.emacsPackages;
 
 melpaBuild rec {
   pname = "term-switcher";
diff --git a/tools/emacs/default.nix b/tools/emacs/default.nix
index 728dd5e6af..c980c678d6 100644
--- a/tools/emacs/default.nix
+++ b/tools/emacs/default.nix
@@ -10,11 +10,11 @@
 { depot, ... }:
 
 with depot;
-with third_party.emacsPackagesNg;
+with third_party.emacsPackages;
 with third_party.emacs;
 
 let
-  emacsWithPackages = (third_party.emacsPackagesNgGen third_party.emacs26).emacsWithPackages;
+  emacsWithPackages = (third_party.emacsPackagesGen third_party.emacs26).emacsWithPackages;
 
   # $PATH for binaries that need to be available to Emacs
   emacsBinPath = lib.makeBinPath [ third_party.telega ];
-- 
cgit 1.4.1