commit 5f98e7c92b1a7030324c85c40fa0b46e0ba4cb23 · pyrox.dev/nixpkgs

nixos/doc/manual/release-notes/rl-2311.section.md

···

136
136

137
137

- `pharo` has been updated to latest stable (PharoVM 10.0.5), which is compatible with the latest stable and oldstable images (Pharo 10 and 11). The VM in question is the 64bit Spur. The 32bit version has been dropped due to lack of maintenance. The Cog VM has been deleted because it is severily outdated. Finally, the `pharo-launcher` package has been deleted because it was not compatible with the newer VM, and due to lack of maintenance.

138
138

139
139
+
- Emacs mainline version 29 was introduced. This new version includes many major additions, most notably `tree-sitter` support (enabled by default) and the pgtk variant (useful for Wayland users), which is available under the attribute `emacs29-pgtk`.

140
140
+

141
141
+
- Emacs macport version 29 was introduced.

142
142
+

139
143

## Other Notable Changes {#sec-release-23.11-notable-changes}

140
144

141
145

- The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.

+10 -1

pkgs/applications/editors/emacs/default.nix

···

       54
       54
        
             withPgtk = true;

     

       55
       55
        
           };

     

       56
       56
        
       

     

       57
       57
       -
           emacs-macport = callPackage (self.sources.emacs-macport) {

     

       57
       57
       +
           emacs28-macport = callPackage (self.sources.emacs28-macport) {

     

       58
       58
       +
             inherit gconf;

     

       59
       59
       +
       

     

       60
       60
       +
             inherit (pkgs.darwin) sigtool;

     

       61
       61
       +
             inherit (pkgs.darwin.apple_sdk.frameworks)

     

       62
       62
       +
               AppKit Carbon Cocoa GSS ImageCaptureCore ImageIO IOKit OSAKit Quartz

     

       63
       63
       +
               QuartzCore WebKit;

     

       64
       64
       +
           };

     

       65
       65
       +
       

     

       66
       66
       +
           emacs29-macport = callPackage (self.sources.emacs29-macport) {

     

       58
       67
        
             inherit gconf;

     

       59
       68
        
       

     

       60
       69
        
             inherit (pkgs.darwin) sigtool;

+39 -19

pkgs/applications/editors/emacs/sources.nix

···

       4
       4
        
       }:

     

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
       -
         mainlineMeta = {

     

       8
       8
       -
           homepage = "https://www.gnu.org/software/emacs/";

     

       9
       9
       -
           description = "The extensible, customizable GNU text editor";

     

       7
       7
       +
         metaFor = variant: version: rev: {

     

       8
       8
       +
           homepage = {

     

       9
       9
       +
             "mainline" = "https://www.gnu.org/software/emacs/";

     

       10
       10
       +
             "macport" = "https://bitbucket.org/mituharu/emacs-mac/";

     

       11
       11
       +
           }.${variant};

     

       12
       12
       +
           description = "The extensible, customizable GNU text editor"

     

       13
       13
       +
                         + lib.optionalString (variant == "macport") " - macport variant";

     

       10
       14
        
           longDescription = ''

     

       11
       15
        
             GNU Emacs is an extensible, customizable text editor—and more. At its core

     

       12
       16
        
             is an interpreter for Emacs Lisp, a dialect of the Lisp programming

     
···

       21
       25
        
             functionality, including a project planner, mail and news reader, debugger

     

       22
       26
        
             interface, calendar, and more. Many of these extensions are distributed

     

       23
       27
        
             with GNU Emacs; others are available separately.

     

       28
       28
       +
           '' + lib.optionalString (variant == "macport") ''

     

       29
       29
       +
       

     

       30
       30
       +
             This release is built from Mitsuharu Yamamoto's patched source code

     

       31
       31
       +
             tailored for macOS.

     

       24
       32
        
           '';

     

       33
       33
       +
           changelog = {

     

       34
       34
       +
             "mainline" = "https://www.gnu.org/savannah-checkouts/gnu/emacs/news/NEWS.${version}";

     

       35
       35
       +
             "macport" = "https://bitbucket.org/mituharu/emacs-mac/raw/${rev}/NEWS-mac";

     

       36
       36
       +
           }.${variant};

     

       25
       37
        
           license = lib.licenses.gpl3Plus;

     

       26
       38
        
           maintainers = with lib.maintainers; [

     

       27
       39
        
             AndersonTorres

     
···

       31
       43
        
             lovek323

     

       32
       44
        
             matthewbauer

     

       33
       45
        
           ];

     

       34
       34
       -
           platforms = lib.platforms.all;

     

       46
       46
       +
           platforms = {

     

       47
       47
       +
             "mainline" = lib.platforms.all;

     

       48
       48
       +
             "macport" = lib.platforms.darwin;

     

       49
       49
       +
           }.${variant};

     

       35
       50
        
           mainProgram = "emacs";

     

       36
       51
        
         };

     

       37
       52
        
       in

     
···

       46
       61
        
             hash = "sha256-4oSLcUDR0MOEt53QOiZSVU8kPJ67GwugmBxdX3F15Ag=";

     

       47
       62
        
           };

     

       48
       63
        
       

     

       49
       49
       -
           meta = mainlineMeta;

     

       64
       64
       +
           meta = metaFor "mainline" "28.2" "28.2";

     

       50
       65
        
         };

     

       51
       66
        
       

     

       52
       67
        
         emacs29 = import ./generic.nix {

     

       53
       68
        
           pname = "emacs";

     

       54
       54
       -
           version = "29.1-rc1";

     

       69
       69
       +
           version = "29.1";

     

       55
       70
        
           variant = "mainline";

     

       56
       71
        
           src = fetchFromSavannah {

     

       57
       72
        
             repo = "emacs";

     

       58
       58
       -
             rev = "29.1-rc1";

     

       59
       59
       -
             hash = "sha256-p0lBSKsHrFwYTqO5UVIF/PgiqwdhYQE4oUVcPtd+gsU=";

     

       73
       73
       +
             rev = "29.1";

     

       74
       74
       +
             hash = "sha256-3HDCwtOKvkXwSULf3W7YgTz4GV8zvYnh2RrL28qzGKg=";

     

       60
       75
        
           };

     

       61
       76
        
       

     

       62
       62
       -
           meta = mainlineMeta;

     

       77
       77
       +
           meta = metaFor "mainline" "29.1" "29.1";

     

       63
       78
        
         };

     

       64
       79
        
       

     

       65
       65
       -
         emacs-macport = import ./generic.nix {

     

       80
       80
       +
         emacs28-macport = import ./generic.nix {

     

       66
       81
        
           pname = "emacs-mac";

     

       67
       82
        
           version = "28.2";

     

       68
       83
        
           variant = "macport";

     
···

       73
       88
        
             hash = "sha256-Ne2jQ2nVLNiQmnkkOXVc5AkLVkTpm8pFC7VNY2gQjPE=";

     

       74
       89
        
           };

     

       75
       90
        
       

     

       76
       76
       -
           meta = {

     

       77
       77
       -
             homepage = "https://bitbucket.org/mituharu/emacs-mac/";

     

       78
       78
       -
             description = mainlineMeta.description + " - with macport patches";

     

       79
       79
       -
             longDescription = mainlineMeta.longDescription + ''

     

       91
       91
       +
           meta = metaFor "macport" "28.2" "emacs-28.2-mac-9.1";

     

       92
       92
       +
         };

     

       93
       93
       +
       

     

       94
       94
       +
         emacs29-macport = import ./generic.nix {

     

       95
       95
       +
           pname = "emacs-mac";

     

       96
       96
       +
           version = "29.1";

     

       97
       97
       +
           variant = "macport";

     

       80
       98
        
       

     

       81
       81
       -
               This release is built from Mitsuharu Yamamoto's patched source code

     

       82
       82
       -
               tailoired for MacOS X.

     

       83
       83
       -
             '';

     

       84
       84
       -
             inherit (mainlineMeta) license maintainers;

     

       85
       85
       -
             platforms = lib.platforms.darwin;

     

       99
       99
       +
           src = fetchFromBitbucket {

     

       100
       100
       +
             owner = "mituharu";

     

       101
       101
       +
             repo = "emacs-mac";

     

       102
       102
       +
             rev = "emacs-29.1-mac-10.0";

     

       103
       103
       +
             hash = "sha256-TE829qJdPjeOQ+kD0SfyO8d5YpJjBge/g+nScwj+XVU=";

     

       86
       104
        
           };

     

       105
       105
       +
       

     

       106
       106
       +
           meta = metaFor "macport" "29.1" "emacs-29.1-mac-10.0";

     

       87
       107
        
         };

     

       88
       108
        
       }

pkgs/top-level/aliases.nix

···

       460
       460
        
         emacs28NativeComp = emacs28; # Added 2022-06-08

     

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

     

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

     

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

     

       463
       464
        
         emacsNativeComp = emacs28NativeComp; # Added 2022-06-08

     

       464
       465
        
         emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22

     

       465
       466
        
         emacsPackagesNg = emacs.pkgs; # Added 2019-08-07

+3 -2

pkgs/top-level/all-packages.nix

···

       31153
       31153
        
           emacs29-gtk3

     

       31154
       31154
        
           emacs29-nox

     

       31155
       31155
        
           emacs29-pgtk

     

       31156
       31156
       -
           emacs-macport

     

       31156
       31156
       +
           emacs28-macport

     

       31157
       31157
       +
           emacs29-macport

     

       31157
       31158
        
         ;

     

       31158
       31159
        
       

     

       31159
       31159
       -
         emacsMacport = emacs-macport;

     

       31160
       31160
       +
         emacs-macport = emacs28-macport;

     

       31160
       31161
        
         emacs = emacs28;

     

       31161
       31162
        
         emacs-gtk = emacs28-gtk3;

     

       31162
       31163
        
         emacs-nox = emacs28-nox;