Unverified Commit 23ff6521 authored by Lin Jian's avatar Lin Jian Committed by GitHub
Browse files

Merge pull request #270558 from linj-fork/pr/default-emacs-29 

emacs: set 29 as default version and remove 28
parents 3561c828 96bc9478

pkgs/applications/editors/emacs/default.nix

+0 −16
Original line number Diff line number Diff line
@@ -32,20 +32,6 @@ lib.makeScope pkgs.newScope (self: 
        fetchFromSavannah;

    };



    emacs28 = callPackage (self.sources.emacs28) inheritedArgs;



    emacs28-gtk2 = self.emacs28.override {

      withGTK2 = true;

    };



    emacs28-gtk3 = self.emacs28.override {

      withGTK3 = true;

    };



    emacs28-nox = pkgs.lowPrio (self.emacs28.override {

      noGui = true;

    });



    emacs29 = callPackage (self.sources.emacs29) inheritedArgs;



    emacs29-gtk3 = self.emacs29.override {
@@ -60,7 +46,5 @@ lib.makeScope pkgs.newScope (self: 
      withPgtk = true;

    };



    emacs28-macport = callPackage (self.sources.emacs28-macport) inheritedArgs;



    emacs29-macport = callPackage (self.sources.emacs29-macport) inheritedArgs;

  })

pkgs/applications/editors/emacs/sources.nix

+0 −16
Original line number Diff line number Diff line
@@ -67,14 +67,6 @@ let 
  };

in

{

  emacs28 = import ./make-emacs.nix (mkArgs {

    pname = "emacs";

    version = "28.2";

    variant = "mainline";

    rev = "28.2";

    hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";

  });



  emacs29 = import ./make-emacs.nix (mkArgs {

    pname = "emacs";

    version = "29.1";
@@ -83,14 +75,6 @@ in 
    hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg=";

  });



  emacs28-macport = import ./make-emacs.nix (mkArgs {

    pname = "emacs-mac";

    version = "28.2";

    variant = "macport";

    rev = "emacs-28.2-mac-9.1";

    hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";

  });



  emacs29-macport = import ./make-emacs.nix (mkArgs {

    pname = "emacs-mac";

    version = "29.1";

pkgs/top-level/aliases.nix

+0 −4
Original line number Diff line number Diff line
@@ -221,11 +221,7 @@ mapAliases ({ 
  elixir_ls = elixir-ls; # Added 2023-03-20



  # Emacs

  emacs28NativeComp = emacs28; # Added 2022-06-08

  emacs28Packages = emacs28.pkgs; # Added 2021-10-04

  emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04

  emacsMacport = emacs-macport; # Added 2023-08-10

  emacsNativeComp = emacs28NativeComp; # Added 2022-06-08

  emacsPackagesNg = throw "'emacsPackagesNg' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2023-09-10

  emacsPackagesNgFor = throw "'emacsPackagesNgFor' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2023-09-10

  emacsWithPackages = emacs.pkgs.withPackages; # Added 2020-12-18

pkgs/top-level/all-packages.nix

+4 −9
Original line number Diff line number Diff line
@@ -31345,22 +31345,17 @@ with pkgs; 
  em = callPackage ../applications/editors/em { };















  inherit (recurseIntoAttrs (darwin.apple_sdk_11_0.callPackage ../applications/editors/emacs { }))













    emacs28













    emacs28-gtk2













    emacs28-gtk3













    emacs28-nox















    emacs29















    emacs29-gtk3















    emacs29-nox















    emacs29-pgtk













    emacs28-macport















    emacs29-macport















  ;



























  emacs-macport = emacs28-macport;













  emacs = emacs28;













  emacs-gtk = emacs28-gtk3;













  emacs-nox = emacs28-nox;













  emacs-macport = emacs29-macport;













  emacs = emacs29;













  emacs-gtk = emacs29-gtk3;













  emacs-nox = emacs29-nox;





























  emacsPackagesFor = emacs: import ./emacs-packages.nix {















    inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs;