Unverified Commit 6978cd64 authored by Lin Jian's avatar Lin Jian Committed by GitHub
Browse files

emacs28-gtk2: remove (#343355)

parents d3e7f568 91fc27de

pkgs/applications/editors/emacs/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -20,10 +20,6 @@ lib.makeScope pkgs.newScope (self: 


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



    emacs28-gtk2 = self.emacs28.override {

      withGTK2 = true;

    };



    emacs28-gtk3 = self.emacs28.override {

      withGTK3 = true;

    };

pkgs/applications/editors/emacs/make-emacs.nix

+2 −11
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
, gnutls

, gpm

, gsettings-desktop-schemas

, gtk2-x11

, gtk3

, gtk3-x11

, harfbuzz
@@ -69,7 +68,6 @@ 
, withAthena ? false

, withCsrc ? true

, withDbus ? stdenv.isLinux

, withGTK2 ? false

, withGTK3 ? withPgtk && !noGui

, withGlibNetworking ? withPgtk || withGTK3 || (withX && withXwidgets)

, withGpm ? stdenv.isLinux
@@ -95,8 +93,7 @@ 
# Options

, siteStart ? ./site-start.el

, toolkit ? (

  if withGTK2 then "gtk2"

  else if withGTK3 then "gtk3"

  if withGTK3 then "gtk3"

  else if withMotif then "motif"

  else if withAthena then "athena"

  else "lucid")
@@ -117,14 +114,11 @@ 
, WebKit

}:



assert (withGTK2 && !withNS && variant != "macport") -> withX;

assert (withGTK3 && !withNS && variant != "macport") -> withX || withPgtk;



assert noGui -> !(withX || withGTK2 || withGTK3 || withNS || variant == "macport");

assert noGui -> !(withX || withGTK3 || withNS || variant == "macport");

assert withAcl -> stdenv.isLinux;

assert withAlsaLib -> stdenv.isLinux;

assert withGTK2 -> !(withGTK3 || withPgtk);

assert withGTK3 -> !withGTK2 || withPgtk;

assert withGpm -> stdenv.isLinux;

assert withNS -> stdenv.isDarwin && !(withX || variant == "macport");

assert withPgtk -> withGTK3 && !withX;
@@ -148,7 +142,6 @@ mkDerivation (finalAttrs: { 
             else if variant == "macport" then "-macport"

             else if withPgtk then "-pgtk"

             else if withGTK3 then "-gtk3"

             else if withGTK2 then "-gtk2"

             else "");

  inherit version;
@@ -241,8 +234,6 @@ mkDerivation (finalAttrs: { 
  ] ++ lib.optionals (stdenv.isLinux && withX) [

    libotf

    m17n_lib

  ] ++ lib.optionals (withX && withGTK2) [

    gtk2-x11

  ] ++ lib.optionals (withX && withGTK3) [

    gtk3-x11

  ] ++ lib.optionals (withX && withMotif) [

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -414,6 +414,7 @@ mapAliases { 
  elixir_ls = elixir-ls; # Added 2023-03-20



  # Emacs

  emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20

  emacs28NativeComp = emacs28; # Added 2022-06-08

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

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

pkgs/top-level/all-packages.nix

+0 −1
Original line number Diff line number Diff line
@@ -29195,7 +29195,6 @@ with pkgs; 














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















    emacs28













    emacs28-gtk2















    emacs28-gtk3















    emacs28-nox