mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-30 22:21:26 +00:00
emacsPackages.orgPackages: deprecated
org elpa is deprecated and moved into gnu elpa and nongnu elpa. link: nix-community/emacs-overlay#191
This commit is contained in:
parent
971b383a28
commit
932ab304f0
@ -24,7 +24,7 @@
|
||||
</section>
|
||||
<section xml:id="sec-release-22.05-incompatibilities">
|
||||
<title>Backward Incompatibilities</title>
|
||||
<itemizedlist spacing="compact">
|
||||
<itemizedlist>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>pkgs.ghc</literal> now refers to
|
||||
@ -46,6 +46,17 @@
|
||||
<literal>haskellPackages.callPackage</literal>).
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
<literal>pkgs.emacsPackages.orgPackages</literal> is removed
|
||||
because org elpa is deprecated. The packages in the top level
|
||||
of <literal>pkgs.emacsPackages</literal>, such as org and
|
||||
org-contrib, refer to the ones in
|
||||
<literal>pkgs.emacsPackages.elpaPackages</literal> and
|
||||
<literal>pkgs.emacsPackages.nongnuPackages</literal> where the
|
||||
new versions will release.
|
||||
</para>
|
||||
</listitem>
|
||||
</itemizedlist>
|
||||
</section>
|
||||
<section xml:id="sec-release-22.05-notable-changes">
|
||||
|
@ -22,4 +22,9 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
instead to ensure cross compilation keeps working (or switch to
|
||||
`haskellPackages.callPackage`).
|
||||
|
||||
* `pkgs.emacsPackages.orgPackages` is removed because org elpa is deprecated.
|
||||
The packages in the top level of `pkgs.emacsPackages`, such as org and
|
||||
org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and
|
||||
`pkgs.emacsPackages.nongnuPackages` where the new versions will release.
|
||||
|
||||
## Other Notable Changes {#sec-release-22.05-notable-changes}
|
||||
|
@ -1,33 +0,0 @@
|
||||
/*
|
||||
|
||||
# Updating
|
||||
|
||||
To update the list of packages from Org (ELPA),
|
||||
|
||||
1. Run `./update-org`.
|
||||
2. Check for evaluation errors:
|
||||
env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate ../../../../.. -A emacs.pkgs.orgPackages
|
||||
3. Run `git commit -m "org-packages $(date -Idate)" -- org-generated.nix`
|
||||
|
||||
*/
|
||||
|
||||
{ lib }:
|
||||
|
||||
self: let
|
||||
|
||||
generateOrg = lib.makeOverridable ({
|
||||
generated ? ./org-generated.nix
|
||||
}: let
|
||||
|
||||
imported = import generated {
|
||||
inherit (self) callPackage;
|
||||
};
|
||||
|
||||
super = imported;
|
||||
|
||||
overrides = {
|
||||
};
|
||||
|
||||
in super // overrides);
|
||||
|
||||
in generateOrg { }
|
@ -11,10 +11,6 @@ curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/
|
||||
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
|
||||
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
|
||||
|
@ -1,4 +0,0 @@
|
||||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell --show-trace ./emacs2nix.nix -i bash
|
||||
|
||||
exec org-packages.sh --names $EMACS2NIX/names.nix -o org-generated.nix
|
@ -45,10 +45,6 @@ let
|
||||
inherit lib pkgs;
|
||||
};
|
||||
|
||||
mkOrgPackages = { lib }: import ../applications/editors/emacs/elisp-packages/org-packages.nix {
|
||||
inherit lib;
|
||||
};
|
||||
|
||||
mkManualPackages = { pkgs, lib }: import ../applications/editors/emacs/elisp-packages/manual-packages.nix {
|
||||
inherit lib pkgs;
|
||||
};
|
||||
@ -66,14 +62,12 @@ in makeScope pkgs'.newScope (self: makeOverridable ({
|
||||
, nongnuPackages ? mkNongnuPackages { inherit pkgs lib; } self
|
||||
, melpaStablePackages ? melpaGeneric { inherit pkgs lib; } "stable" self
|
||||
, melpaPackages ? melpaGeneric { inherit pkgs lib; } "unstable" self
|
||||
, orgPackages ? mkOrgPackages { inherit lib; } self
|
||||
, manualPackages ? mkManualPackages { inherit pkgs lib; } self
|
||||
}: ({}
|
||||
// elpaPackages // { inherit elpaPackages; }
|
||||
// nongnuPackages // { inherit nongnuPackages; }
|
||||
// melpaStablePackages // { inherit melpaStablePackages; }
|
||||
// melpaPackages // { inherit melpaPackages; }
|
||||
// orgPackages // { inherit orgPackages; }
|
||||
// manualPackages // { inherit manualPackages; }
|
||||
// {
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user