diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/cedet/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/cedet/default.nix diff --git a/pkgs/applications/editors/emacs-modes/cedille/default.nix b/pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/cedille/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/cedille/default.nix diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/color-theme-solarized/default.nix diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/elpa-generated.nix rename to pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix similarity index 78% rename from pkgs/applications/editors/emacs-modes/elpa-packages.nix rename to pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 034b698137b..293f33e8316 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -5,8 +5,9 @@ To update the list of packages from MELPA, 1. Run `./update-elpa`. -2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacs.pkgs.elpaPackages`. -3. `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix` +2. Check for evaluation errors: + `nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages`. +3. Run `git commit -m "elpa-packages $(date -Idate)" -- elpa-generated.nix` ## Update from overlay @@ -15,8 +16,8 @@ Alternatively, run the following command: ./update-from-overlay It will update both melpa and elpa packages using -https://github.com/nix-community/emacs-overlay. It's almost -instantenous and formats commits for you. +https://github.com/nix-community/emacs-overlay. It's almost instantenous and +formats commits for you. */ @@ -30,7 +31,7 @@ self: let }); }; - elpaBuild = import ../../../build-support/emacs/elpa.nix { + elpaBuild = import ../../../../build-support/emacs/elpa.nix { inherit lib stdenv texinfo writeText; inherit (self) emacs; }; diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix similarity index 91% rename from pkgs/applications/editors/emacs-modes/emacs2nix.nix rename to pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix index 658756250a0..5d4c438bce9 100644 --- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix @@ -1,5 +1,5 @@ let - pkgs = import ../../../.. { }; + pkgs = import ../../../../.. { }; src = pkgs.fetchgit { url = "https://github.com/ttuegel/emacs2nix.git"; diff --git a/pkgs/applications/editors/emacs-modes/emacspeak/default.nix b/pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/emacspeak/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/emacspeak/default.nix diff --git a/pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/ess-R-object-popup/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/ess-R-object-popup/default.nix diff --git a/pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/font-lock-plus/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/font-lock-plus/default.nix diff --git a/pkgs/applications/editors/emacs-modes/helm-words/default.nix b/pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/helm-words/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/helm-words/default.nix diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs/elisp-packages/hsc3/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/hsc3/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/hsc3/default.nix diff --git a/pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix b/pkgs/applications/editors/emacs/elisp-packages/ido-ubiquitous/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/ido-ubiquitous/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/ido-ubiquitous/default.nix diff --git a/pkgs/applications/editors/emacs-modes/jam-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/jam-mode/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/jam-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/jam-mode/default.nix diff --git a/pkgs/applications/editors/emacs-modes/libgenerated.nix b/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/libgenerated.nix rename to pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/manual-packages.nix rename to pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix similarity index 97% rename from pkgs/applications/editors/emacs-modes/melpa-packages.nix rename to pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 5a1c9168bc4..9e7662fe490 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -4,11 +4,11 @@ To update the list of packages from MELPA, -1. Run ./update-melpa +1. Run `./update-melpa` 2. Check for evaluation errors: -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacs.pkgs..melpaStablePackages -env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacs.pkgs..melpaPackages -3. `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json` + env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages + env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages +3. Run `git commit -m "melpa-packages: $(date -Idate)" recipes-archive-melpa.json` ## Update from overlay @@ -17,8 +17,8 @@ Alternatively, run the following command: ./update-from-overlay It will update both melpa and elpa packages using -https://github.com/nix-community/emacs-overlay. It's almost -instantenous and formats commits for you. +https://github.com/nix-community/emacs-overlay. It's almost instantenous and +formats commits for you. */ diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/org-generated.nix rename to pkgs/applications/editors/emacs/elisp-packages/org-generated.nix diff --git a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix b/pkgs/applications/editors/emacs/elisp-packages/org-mac-link/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/org-mac-link/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/org-mac-link/default.nix diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix similarity index 69% rename from pkgs/applications/editors/emacs-modes/org-packages.nix rename to pkgs/applications/editors/emacs/elisp-packages/org-packages.nix index b60af0e9334..dcddbe71af8 100644 --- a/pkgs/applications/editors/emacs-modes/org-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix @@ -5,8 +5,8 @@ To update the list of packages from Org (ELPA), 1. Run `./update-org`. -2. Check for evaluation errors: `nix-instantiate ../../../.. -A emacs.pkgs.orgPackages`. -3. `git commit -m "org-packages $(date -Idate)" -- org-generated.nix` +2. Check for evaluation errors: `nix-instantiate ../../../../.. -A emacs.pkgs.orgPackages`. +3. Run `git commit -m "org-packages $(date -Idate)" -- org-generated.nix` */ diff --git a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix b/pkgs/applications/editors/emacs/elisp-packages/perl-completion/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/perl-completion/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/perl-completion/default.nix diff --git a/pkgs/applications/editors/emacs-modes/pod-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/pod-mode/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/pod-mode/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/pod-mode/default.nix diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs/elisp-packages/prolog/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/prolog/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/prolog/default.nix diff --git a/pkgs/applications/editors/emacs-modes/railgun/default.nix b/pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/railgun/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/railgun/default.nix diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json similarity index 100% rename from pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json rename to pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/rect-mark/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/rect-mark/default.nix diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/session-management-for-emacs/default.nix diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/sunrise-commander/default.nix diff --git a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix b/pkgs/applications/editors/emacs/elisp-packages/sv-kalender/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/sv-kalender/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/sv-kalender/default.nix diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/tramp/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/tramp/default.nix diff --git a/pkgs/applications/editors/emacs-modes/update-elpa b/pkgs/applications/editors/emacs/elisp-packages/update-elpa similarity index 100% rename from pkgs/applications/editors/emacs-modes/update-elpa rename to pkgs/applications/editors/emacs/elisp-packages/update-elpa diff --git a/pkgs/applications/editors/emacs-modes/update-from-overlay b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay similarity index 77% rename from pkgs/applications/editors/emacs-modes/update-from-overlay rename to pkgs/applications/editors/emacs/elisp-packages/update-from-overlay index 886019716d4..41cde07a211 100755 --- a/pkgs/applications/editors/emacs-modes/update-from-overlay +++ b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay @@ -8,14 +8,14 @@ export NIXPKGS_ALLOW_BROKEN=1 # You can use this to avoid running lengthy code generation jobs locally curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix -nix-instantiate ../../../.. -A emacs.pkgs.elpaPackages --show-trace +nix-instantiate ../../../../../ -A emacs.pkgs.elpaPackages --show-trace git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacs.pkgs.elpa-packages: $(date --iso)" -- elpa-generated.nix curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix -nix-instantiate ../../../.. -A emacs.pkgs.orgPackages --show-trace +nix-instantiate ../../../../../ -A emacs.pkgs.orgPackages --show-trace git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacs.pkgs.org-packages: $(date --iso)" -- org-generated.nix curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json -nix-instantiate --show-trace ../../../../ -A emacs.pkgs.melpaStablePackages -nix-instantiate --show-trace ../../../../ -A emacs.pkgs.melpaPackages +nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaStablePackages +nix-instantiate --show-trace ../../../../../ -A emacs.pkgs.melpaPackages git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacs.pkgs.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json diff --git a/pkgs/applications/editors/emacs-modes/update-melpa b/pkgs/applications/editors/emacs/elisp-packages/update-melpa similarity index 100% rename from pkgs/applications/editors/emacs-modes/update-melpa rename to pkgs/applications/editors/emacs/elisp-packages/update-melpa diff --git a/pkgs/applications/editors/emacs-modes/update-melpa.el b/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el similarity index 100% rename from pkgs/applications/editors/emacs-modes/update-melpa.el rename to pkgs/applications/editors/emacs/elisp-packages/update-melpa.el diff --git a/pkgs/applications/editors/emacs-modes/update-org b/pkgs/applications/editors/emacs/elisp-packages/update-org similarity index 100% rename from pkgs/applications/editors/emacs-modes/update-org rename to pkgs/applications/editors/emacs/elisp-packages/update-org diff --git a/pkgs/applications/editors/emacs-modes/updater-emacs.nix b/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix similarity index 96% rename from pkgs/applications/editors/emacs-modes/updater-emacs.nix rename to pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix index 7502bcc2fee..0f69da2384d 100644 --- a/pkgs/applications/editors/emacs-modes/updater-emacs.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix @@ -1,5 +1,5 @@ let - pkgs = import ../../../.. {}; + pkgs = import ../../../../.. {}; emacsEnv = pkgs.emacs.pkgs.withPackages (epkgs: let diff --git a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix b/pkgs/applications/editors/emacs/elisp-packages/zeitgeist/default.nix similarity index 100% rename from pkgs/applications/editors/emacs-modes/zeitgeist/default.nix rename to pkgs/applications/editors/emacs/elisp-packages/zeitgeist/default.nix diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 67f4d116dfd..d168d34e373 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -25,21 +25,21 @@ let - mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs-modes/elpa-packages.nix { + mkElpaPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/elpa-packages.nix { inherit (pkgs) stdenv texinfo writeText; inherit lib; }; # Contains both melpa stable & unstable - melpaGeneric = { pkgs, lib }: import ../applications/editors/emacs-modes/melpa-packages.nix { + melpaGeneric = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/melpa-packages.nix { inherit lib pkgs; }; - mkOrgPackages = { lib }: import ../applications/editors/emacs-modes/org-packages.nix { + mkOrgPackages = { lib }: import ../applications/editors/emacs/elisp-packages/org-packages.nix { inherit lib; }; - mkManualPackages = { pkgs, lib }: import ../applications/editors/emacs-modes/manual-packages.nix { + mkManualPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/manual-packages.nix { inherit lib pkgs; };