Merge pull request #123859 from AndersonTorres/new-emacs-modes
Update Elisp packages infrastructure
This commit is contained in:
commit
e604947beb
|
@ -655,10 +655,10 @@
|
|||
elpaBuild {
|
||||
pname = "corfu";
|
||||
ename = "corfu";
|
||||
version = "0.6";
|
||||
version = "0.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.6.tar";
|
||||
sha256 = "0zl769l3mmy4b0pj70dwjllq0224r2w4l45xvaqbj75qfqclj6cj";
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.8.tar";
|
||||
sha256 = "1qrrky1g4k5vw56435dgkwnmnri7i51gkydd76as3l0ixm4pnp05";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
@ -1738,6 +1738,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
isearch-mb = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "isearch-mb";
|
||||
ename = "isearch-mb";
|
||||
version = "0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/isearch-mb-0.2.tar";
|
||||
sha256 = "1mfjppv33cb5f5f6cc1486msxjxfjnnkryc1yax43k6fgzjr0j4h";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/isearch-mb.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
iterators = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "iterators";
|
||||
|
@ -2544,10 +2559,10 @@
|
|||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "9.4.5";
|
||||
version = "9.4.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-9.4.5.tar";
|
||||
sha256 = "0h5qhrd984vf17qc227wz68191xfgbpq32dyhw0lcz2d9i0pl3xk";
|
||||
url = "https://elpa.gnu.org/packages/org-9.4.6.tar";
|
||||
sha256 = "1k49ymsi77366as2wi4kzv2f1xnbwpb47iw7iw07yxwlhmm7vskq";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
@ -2829,10 +2844,10 @@
|
|||
elpaBuild {
|
||||
pname = "pyim";
|
||||
ename = "pyim";
|
||||
version = "3.7.5";
|
||||
version = "3.7.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/pyim-3.7.5.tar";
|
||||
sha256 = "09f34wgzckbxgr5xvaqrj0wdcmnfsb31a6m460f5g0acys20ams5";
|
||||
url = "https://elpa.gnu.org/packages/pyim-3.7.6.tar";
|
||||
sha256 = "1crimmvyppjmds9shfvxy9j5zi3mk133bv5av0fgicm7ddkivksr";
|
||||
};
|
||||
packageRequires = [ async emacs xr ];
|
||||
meta = {
|
||||
|
@ -3955,10 +3970,10 @@
|
|||
elpaBuild {
|
||||
pname = "vertico";
|
||||
ename = "vertico";
|
||||
version = "0.8";
|
||||
version = "0.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vertico-0.8.tar";
|
||||
sha256 = "1cdq49csd57vqhrs1nbif79yw4s8c0p2i2ww5n5znzj7rnxwpva4";
|
||||
url = "https://elpa.gnu.org/packages/vertico-0.10.tar";
|
||||
sha256 = "07bzhxgp3k6q4wl9ijhx4vg8diinn782xhr8axn790a5vj199j78";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
|
@ -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;
|
||||
};
|
|
@ -1,5 +1,5 @@
|
|||
let
|
||||
pkgs = import ../../../.. { };
|
||||
pkgs = import ../../../../.. { };
|
||||
|
||||
src = pkgs.fetchgit {
|
||||
url = "https://github.com/ttuegel/emacs2nix.git";
|
|
@ -211,13 +211,19 @@
|
|||
# From old emacsPackages (pre emacsPackagesNg)
|
||||
cedet = callPackage ./cedet { };
|
||||
cedille = callPackage ./cedille { cedille = pkgs.cedille; };
|
||||
colorThemeSolarized = callPackage ./color-theme-solarized { };
|
||||
emacsSessionManagement = callPackage ./session-management-for-emacs { };
|
||||
color-theme-solarized = callPackage ./color-theme-solarized { };
|
||||
session-management-for-emacs = callPackage ./session-management-for-emacs { };
|
||||
hsc3-mode = callPackage ./hsc3 { };
|
||||
ido-ubiquitous = callPackage ./ido-ubiquitous { };
|
||||
prolog-mode = callPackage ./prolog { };
|
||||
rectMark = callPackage ./rect-mark { };
|
||||
sunriseCommander = callPackage ./sunrise-commander { };
|
||||
rect-mark = callPackage ./rect-mark { };
|
||||
sunrise-commander = callPackage ./sunrise-commander { };
|
||||
|
||||
# camelCase aliases for some of the kebab-case expressions above
|
||||
colorThemeSolarized = color-theme-solarized;
|
||||
emacsSessionManagement = session-management-for-emacs;
|
||||
rectMark = rect-mark;
|
||||
sunriseCommander = sunrise-commander;
|
||||
|
||||
# Legacy aliases, these try to mostly map to melpa stable because it's
|
||||
# closer to the old outdated package infra.
|
|
@ -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.
|
||||
|
||||
*/
|
||||
|
|
@ -4,10 +4,10 @@
|
|||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "20210510";
|
||||
version = "20210519";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-20210510.tar";
|
||||
sha256 = "015c68pk52vksar7kpyb0nkcyjihlczmpq4h5vdv8xayas2qlzc7";
|
||||
url = "https://orgmode.org/elpa/org-20210519.tar";
|
||||
sha256 = "14vchfg69wai1yxv1fzvjk185gnfr7d9qrdijf0qmbbr5znci8rf";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
@ -19,10 +19,10 @@
|
|||
elpaBuild {
|
||||
pname = "org-plus-contrib";
|
||||
ename = "org-plus-contrib";
|
||||
version = "20210510";
|
||||
version = "20210519";
|
||||
src = fetchurl {
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210510.tar";
|
||||
sha256 = "0pdwjnpcsk75jv4qs8n4xia6vspwn6dndbdx9z7kq5vqz7w4ykmw";
|
||||
url = "https://orgmode.org/elpa/org-plus-contrib-20210519.tar";
|
||||
sha256 = "0g765fsc7ssn779xnhjzrxy1sz5b019h7dk1q26yk2w6i540ybfl";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
|
@ -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`
|
||||
|
||||
*/
|
||||
|
File diff suppressed because it is too large
Load diff
|
@ -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
|
|
@ -1,5 +1,5 @@
|
|||
let
|
||||
pkgs = import ../../../.. {};
|
||||
pkgs = import ../../../../.. {};
|
||||
|
||||
emacsEnv = pkgs.emacs.pkgs.withPackages (epkgs: let
|
||||
|
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue