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

emacs-macport: 29.1 -> 29.4 (#396416)

parents 344c70b8 86733544

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

+2 −2
Original line number Diff line number Diff line
@@ -535,10 +535,10 @@ mkDerivation (finalAttrs: { 
    };

  };



  meta = meta // {

  meta = {

    broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);

    knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [

      "CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30"

    ];

  };

  } // meta;

})

pkgs/applications/editors/emacs/sources.nix

+20 −4
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ let 
      patches ? _: [ ],

      rev,

      hash,

      meta ? { },

    }:

    {

      inherit
@@ -98,7 +99,7 @@ let 
          }

          .${variant};

        mainProgram = "emacs";

      };

      } // meta;

    };

in

{
@@ -152,9 +153,24 @@ in 


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

    pname = "emacs-mac";

    version = "29.1";

    version = "29.4";

    variant = "macport";

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

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

    rev = "emacs-29.4-mac-10.1";

    hash = "sha256-8OQ+fon9tclbh/eUJ09uqKfMaz9M77QnLIp2R8QB6Ic=";

    patches = fetchpatch: [

      # CVE-2024-53920

      (fetchpatch {

        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/07_all_trusted-content.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f";

        hash = "sha256-zUWM2HDO5MHEB5fC5TCUxzmSafMvXO5usRzCyp9Q7P4=";

      })



      # CVE-2025-1244

      (fetchpatch {

        url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/29.4/06_all_man.patch?id=f24370de4de0a37304958ec1569d5c50c1745b7f";

        hash = "sha256-Vdf6GF5YmGoHTkxiD9mdYH0hgvfovZwrqYN1NQ++U1w=";

      })

    ];



    meta.knownVulnerabilities = [ ];

  });

}