Merge branch 'emacs-packages'
This commit is contained in:
commit
f944f4906d
File diff suppressed because it is too large
Load diff
|
@ -2,12 +2,13 @@
|
||||||
|
|
||||||
# Updating
|
# Updating
|
||||||
|
|
||||||
To update the list of packages from ELPA,
|
To update the list of packages from MELPA,
|
||||||
|
|
||||||
1. Clone https://github.com/ttuegel/emacs2nix
|
1. Clone https://github.com/ttuegel/emacs2nix.
|
||||||
2. Run `./elpa-packages.sh` from emacs2nix
|
2. Run `./elpa-packages.sh` from emacs2nix.
|
||||||
3. Copy the new elpa-packages.json file into Nixpkgs
|
3. Copy the new `elpa-generated.nix` file into Nixpkgs.
|
||||||
4. `git commit -m "elpa-packages $(date -Idate)"`
|
4. Check for evaluation errors: `nix-instantiate ./. -A emacsPackagesNg.elpaPackages`.
|
||||||
|
5. `git add pkgs/applications/editors/emacs-modes/elpa-generated.nix && git commit -m "elpa-packages $(date -Idate)"`
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@ -40,6 +41,7 @@ self:
|
||||||
midi-kbd = markBroken super.midi-kbd; # requires emacs-25
|
midi-kbd = markBroken super.midi-kbd; # requires emacs-25
|
||||||
stream = markBroken super.stream; # requires emacs-25
|
stream = markBroken super.stream; # requires emacs-25
|
||||||
cl-lib = null; # builtin
|
cl-lib = null; # builtin
|
||||||
|
tle = null; # builtin
|
||||||
};
|
};
|
||||||
|
|
||||||
elpaPackages = super // overrides;
|
elpaPackages = super // overrides;
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -4,11 +4,12 @@
|
||||||
|
|
||||||
To update the list of packages from MELPA,
|
To update the list of packages from MELPA,
|
||||||
|
|
||||||
1. Clone https://github.com/ttuegel/emacs2nix
|
1. Clone https://github.com/ttuegel/emacs2nix.
|
||||||
2. Clone https://github.com/milkypostman/melpa
|
2. Clone https://github.com/milkypostman/melpa.
|
||||||
3. Run `./melpa-packages.sh PATH_TO_MELPA_CLONE` from emacs2nix
|
3. Run `./melpa-packages.sh --melpa PATH_TO_MELPA_CLONE` from emacs2nix.
|
||||||
4. Copy the new melpa-packages.json file into Nixpkgs
|
4. Copy the new `melpa-generated.nix` file into Nixpkgs.
|
||||||
5. `git commit -m "melpa-packages $(date -Idate)"`
|
5. Check for evaluation errors: `nix-instantiate ./. -A emacsPackagesNg.melpaPackages`.
|
||||||
|
6. `git add pkgs/applications/editors/emacs-modes/melpa-generated.nix && git commit -m "melpa-packages $(date -Idate)"`
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -2,15 +2,14 @@
|
||||||
|
|
||||||
# Updating
|
# Updating
|
||||||
|
|
||||||
To update the list of packages from MELPA Stable,
|
To update the list of packages from MELPA,
|
||||||
|
|
||||||
1. Clone https://github.com/ttuegel/emacs2nix
|
1. Clone https://github.com/ttuegel/emacs2nix.
|
||||||
2. Clone https://github.com/milkypostman/melpa
|
2. Clone https://github.com/milkypostman/melpa.
|
||||||
3. Run `./melpa-stable-packages.sh PATH_TO_MELPA_CLONE` from emacs2nix.
|
3. Run `./melpa-stable-packages.sh --melpa PATH_TO_MELPA_CLONE` from emacs2nix.
|
||||||
Error messages about missing versions are normal; most packages in
|
4. Copy the new `melpa-stable-generated.nix` file into Nixpkgs.
|
||||||
MELPA do not have a stable version.
|
5. Check for evaluation errors: `nix-instantiate ./. -A emacsPackagesNg.melpaStablePackages`.
|
||||||
4. Copy the new melpa-stable-packages.json file into Nixpkgs
|
6. `git add pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix && git commit -m "melpa-stable-packages $(date -Idate)"`
|
||||||
5. `git commit -m "melpa-stable-packages $(date -Idate)"`
|
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue