diff options
author | Vonfry <mail@vonfry.name> | 2021-12-02 10:27:29 +0800 |
---|---|---|
committer | Vonfry <mail@vonfry.name> | 2021-12-02 16:16:59 +0800 |
commit | 932ab304f0b8e3241c1311b9b731d3d330291715 (patch) | |
tree | 3e5586d1abe148457bb2801de08657ac28ecc5c5 /pkgs | |
parent | 971b383a28f4baee8ea3931af4840fa221929fd6 (diff) |
emacsPackages.orgPackages: deprecated
org elpa is deprecated and moved into gnu elpa and nongnu elpa. link: nix-community/emacs-overlay#191
Diffstat (limited to 'pkgs')
4 files changed, 0 insertions, 47 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix deleted file mode 100644 index 12680336e0e81..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/org-packages.nix +++ /dev/null @@ -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 { } diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay index 41cde07a211c9..052364c803c1a 100755 --- a/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay +++ b/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay @@ -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 diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-org b/pkgs/applications/editors/emacs/elisp-packages/update-org deleted file mode 100755 index 2119a1672287f..0000000000000 --- a/pkgs/applications/editors/emacs/elisp-packages/update-org +++ /dev/null @@ -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 diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index ba1ed113ab60a..0ac3ae8b43392 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.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; } // { |