diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:18:44 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:25:38 +0200 |
| commit | 7a005601d48f760864258e369364b3b847d4e9fd (patch) | |
| tree | fb562597c59110eb319e9cd8f484280fcf587433 /pkgs/applications/editors/emacs-modes/melpa-packages.nix | |
| parent | 7d7a9df3605c86e17bced51afe67eecd43f99754 (diff) | |
| parent | df310048e5f4a516663bf8c5a74029b54813a7f3 (diff) | |
| download | nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.gz nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.bz2 nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.lz nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.xz nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.tar.zst nixpkgs-7a005601d48f760864258e369364b3b847d4e9fd.zip | |
Merge branch 'master' to resolve conflicts
Diffstat (limited to 'pkgs/applications/editors/emacs-modes/melpa-packages.nix')
| -rw-r--r-- | pkgs/applications/editors/emacs-modes/melpa-packages.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f213ba396a7..3106336a48d 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -4,11 +4,12 @@ To update the list of packages from MELPA, -1. Clone https://github.com/ttuegel/emacs2nix -2. Clone https://github.com/milkypostman/melpa -3. Run `./melpa-packages.sh PATH_TO_MELPA_CLONE` from emacs2nix -4. Copy the new melpa-packages.json file into Nixpkgs -5. `git commit -m "melpa-packages $(date -Idate)"` +1. Clone https://github.com/ttuegel/emacs2nix. +2. Clone https://github.com/milkypostman/melpa. +3. Run `./melpa-packages.sh --melpa PATH_TO_MELPA_CLONE` from emacs2nix. +4. Copy the new `melpa-generated.nix` file into Nixpkgs. +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)"` */ |