commit 55f57facbfabaee42908c24a2ac4b4dd8443fa65 · pyrox.dev/nixpkgs

-16

pkgs/applications/editors/emacs/27.nix

···

       1
       -
       import ./generic.nix (rec {

     

       2
       -
         version = "27.2";

     

       3
       -
         sha256 = "sha256-tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk=";

     

       4
       -
         patches = fetchpatch: [

     

       5
       -
           (fetchpatch {

     

       6
       -
             name = "fix-aarch64-darwin-triplet.patch";

     

       7
       -
             url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=a88f63500e475f842e5fbdd9abba4ce122cdb082";

     

       8
       -
             sha256 = "sha256-RF9b5PojFUAjh2TDUW4+HaWveV30Spy1iAXhaWf1ZVg=";

     

       9
       -
           })

     

       10
       -
           # glibc 2.34 compat

     

       11
       -
           (fetchpatch {

     

       12
       -
             url = "https://src.fedoraproject.org/rpms/emacs/raw/181aafcdb7ee2fded9fce4cfc448f27edccc927f/f/emacs-glibc-2.34.patch";

     

       13
       -
             sha256 = "sha256-2o3C/jhZPl2OW/LmVPt/fhdwbS9NOdF9lVEF1Kn9aEk=";

     

       14
       -
           })

     

       15
       -
         ];

     

       16
       -
       })

+5

pkgs/applications/editors/emacs/28.nix

···

       1
       +
       import ./generic.nix (rec {

     

       2
       +
         version = "28.1";

     

       3
       +
         sha256 = "sha256-KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE=";

     

       4
       +
         patches = _: [ ];

     

       5
       +
       })

-15

pkgs/applications/editors/emacs/at-fdcwd.patch

···

       1
       -
       diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h

     

       2
       -
       index 84ede3e..8e8f42e 100644

     

       3
       -
       --- a/lib/careadlinkat.h

     

       4
       -
       +++ b/lib/careadlinkat.h

     

       5
       -
       @@ -23,6 +23,10 @@

     

       6
       -
        #include <fcntl.h>

     

       7
       -
        #include <unistd.h>

     

       8
       -
        

     

       9
       -
       +#ifndef AT_FDCWD

     

       10
       -
       +#define AT_FDCWD -2

     

       11
       -
       +#endif

     

       12
       -
       +

     

       13
       -
        struct allocator;

     

       14
       -
        

     

       15
       -
        /* Assuming the current directory is FD, get the symbolic link value

+1 -1

pkgs/applications/editors/emacs/generic.nix

···

       11
        
       , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux

     

       12
        
       , alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf

     

       13
        
       , sigtool, jansson, harfbuzz, sqlite, nixosTests

     

       14
       -
       , dontRecurseIntoAttrs ,emacsPackagesFor

     

       15
        
       , libgccjit, targetPlatform, makeWrapper # native-comp params

     

       16
        
       , systemd ? null

     

       17
        
       , withX ? !stdenv.isDarwin

···

       11
        
       , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux

     

       12
        
       , alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf

     

       13
        
       , sigtool, jansson, harfbuzz, sqlite, nixosTests

     

       14
       +
       , dontRecurseIntoAttrs, emacsPackagesFor

     

       15
        
       , libgccjit, targetPlatform, makeWrapper # native-comp params

     

       16
        
       , systemd ? null

     

       17
        
       , withX ? !stdenv.isDarwin

+2 -2

pkgs/top-level/aliases.nix

···

       344
        
         electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned"; # Added 2022-01-01

     

       345
        
       

     

       346
        
         # Emacs

     

       347
       -
         emacs27Packages = emacs27.pkgs; # Added 2020-12-18

     

       348
       -
         emacs27WithPackages = emacs27.pkgs.withPackages; # Added 2020-12-18

     

       349
        
         emacsPackages = emacs.pkgs; # Added 2020-12-18

     

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

     

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

···

       344
        
         electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned"; # Added 2022-01-01

     

       345
        
       

     

       346
        
         # Emacs

     

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

     

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

     

       349
        
         emacsPackages = emacs.pkgs; # Added 2020-12-18

     

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

     

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

+9 -4

pkgs/top-level/all-packages.nix

···

       25480
        
       

     

       25481
        
         em = callPackage ../applications/editors/em { };

     

       25482
        
       

     

       25483
       -
         emacs = emacs27;

     

       25484
       -
         emacs-nox = emacs27-nox;

     

       0
        
       
     

       25485
        
       

     

       25486
       -
         emacs27 = callPackage ../applications/editors/emacs/27.nix {

     

       25487
        
           # use override to enable additional features

     

       25488
        
           libXaw = xorg.libXaw;

     

       25489
        
           Xaw3d = null;

     
···

       25495
        
           inherit (darwin) sigtool;

     

       25496
        
         };

     

       25497
        
       

     

       25498
       -
         emacs27-nox = lowPrio (emacs27.override {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       25499
        
           withX = false;

     

       25500
        
           withNS = false;

     

       25501
        
           withGTK2 = false;

···

       25480
        
       

     

       25481
        
         em = callPackage ../applications/editors/em { };

     

       25482
        
       

     

       25483
       +
         emacs = emacs28;

     

       25484
       +
         emacsNativeComp = emacs28NativeComp;

     

       25485
       +
         emacs-nox = emacs28-nox;

     

       25486
        
       

     

       25487
       +
         emacs28 = callPackage ../applications/editors/emacs/28.nix {

     

       25488
        
           # use override to enable additional features

     

       25489
        
           libXaw = xorg.libXaw;

     

       25490
        
           Xaw3d = null;

     
···

       25496
        
           inherit (darwin) sigtool;

     

       25497
        
         };

     

       25498
        
       

     

       25499
       +
         emacs28NativeComp = emacs28.override {

     

       25500
       +
           nativeComp = true;

     

       25501
       +
         };

     

       25502
       +
       

     

       25503
       +
         emacs28-nox = lowPrio (emacs28.override {

     

       25504
        
           withX = false;

     

       25505
        
           withNS = false;

     

       25506
        
           withGTK2 = false;

+1 -1

pkgs/top-level/packages-config.nix

···

       47
        
           };

     

       48
        
       

     

       49
        
           # This is an alias which we disallow by default; explicitly allow it

     

       50
       -
           emacs27Packages = emacs27.pkgs;

     

       51
        
         };

     

       52
        
       }

···

       47
        
           };

     

       48
        
       

     

       49
        
           # This is an alias which we disallow by default; explicitly allow it

     

       50
       +
           emacs28Packages = emacs28.pkgs;

     

       51
        
         };

     

       52
        
       }