mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: emacsPackagesNg -> emacsPackages

Browse source 
The former is now just an alias for the latter anyways.
This commit is contained in:
Vincent Ambo 2020-03-08 23:17:01 +00:00
parent 6cbcadc2e4
commit 65e533431a
8 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
overrides/writeElispBin/default.nix
View file

@ -3,10 +3,10 @@
{ name, src, deps ? (_: []), emacs ? pkgs.emacs26-nox }: { name, src, deps ? (_: []), emacs ? pkgs.emacs26-nox }:
let let
inherit (pkgs) emacsPackagesNg emacsPackagesNgGen writeTextFile; inherit (pkgs) emacsPackages emacsPackagesGen writeTextFile;
inherit (builtins) isString toFile; inherit (builtins) isString toFile;
finalEmacs = (emacsPackagesNgGen emacs).emacsWithPackages deps; finalEmacs = (emacsPackagesGen emacs).emacsWithPackages deps;
srcFile = if isString src srcFile = if isString src
then toFile "${name}.el" src then toFile "${name}.el" src

4
third_party/default.nix vendored
View file

@ -39,8 +39,8 @@ let
dockerTools dockerTools
emacs26 emacs26
emacs26-nox emacs26-nox
emacsPackagesNg emacsPackages
emacsPackagesNgGen emacsPackagesGen
fetchFromGitHub fetchFromGitHub
fetchurl fetchurl
fetchzip fetchzip

2
third_party/emacs/carp-mode.nix vendored
View file

@ -1,7 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
with pkgs; with pkgs;
with emacsPackagesNg; with emacsPackages;
melpaBuild rec { melpaBuild rec {
pname = "carp-mode"; pname = "carp-mode";

2
third_party/emacs/rcirc/default.nix vendored
View file

@ -1,6 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
pkgs.emacsPackagesNg.trivialBuild rec { pkgs.emacsPackages.trivialBuild rec {
pname = "rcirc"; pname = "rcirc";
version = "1"; version = "1";
src = ./rcirc.el; src = ./rcirc.el;

2
tools/emacs-pkgs/dottime/default.nix
View file

@ -1,6 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
pkgs.emacsPackagesNg.trivialBuild rec { pkgs.emacsPackages.trivialBuild rec {
pname = "dottime"; pname = "dottime";
version = "1.0"; version = "1.0";
src = ./dottime.el; src = ./dottime.el;

2
tools/emacs-pkgs/nix-util/default.nix
View file

@ -1,6 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
pkgs.emacsPackagesNg.trivialBuild rec { pkgs.emacsPackages.trivialBuild rec {
pname = "nix-util"; pname = "nix-util";
version = "1.0"; version = "1.0";
src = ./nix-util.el; src = ./nix-util.el;

2
tools/emacs-pkgs/term-switcher/default.nix
View file

@ -1,6 +1,6 @@
{ pkgs, ... }: { pkgs, ... }:
with pkgs.emacsPackagesNg; with pkgs.emacsPackages;
melpaBuild rec { melpaBuild rec {
pname = "term-switcher"; pname = "term-switcher";

4
tools/emacs/default.nix
View file

@ -10,11 +10,11 @@
{ depot, ... }: { depot, ... }:
with depot; with depot;
with third_party.emacsPackagesNg; with third_party.emacsPackages;
with third_party.emacs; with third_party.emacs;
let 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 # $PATH for binaries that need to be available to Emacs
emacsBinPath = lib.makeBinPath [ third_party.telega ]; emacsBinPath = lib.makeBinPath [ third_party.telega ];