Commit 5ece9f37 authored by Lily Ballard's avatar Lily Ballard
Browse files

macvim: 179 -> 181 

Updates macvim to r181, including bumping the Ruby version to 3.4 since
that's what MacVim r181 is built against.

There's still 3 CVEs in the `knownVulnerabilities` list that are newer
than this release, but this is the latest MacVim release available right
now.
parent c06af958

pkgs/applications/editors/vim/macvim.nix

+5 −27
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  gettext,

  pkg-config,

  cscope,

  ruby,

  ruby_3_4,

  tcl,

  perl,

  luajit,
@@ -24,9 +24,8 @@ in 


# Try to match MacVim's documented script interface compatibility

let

  #perl = perl540;

  # Ruby 3.3

  #ruby = ruby_3_3;

  # Ruby 3.4

  ruby = ruby_3_4;



  # Building requires a few system tools to be in PATH.

  # Some of these we could patch into the relevant source files (such as xcodebuild and
@@ -41,13 +40,13 @@ in 
stdenv.mkDerivation (finalAttrs: {

  pname = "macvim";



  version = "179";

  version = "181";



  src = fetchFromGitHub {

    owner = "macvim-dev";

    repo = "macvim";

    rev = "release-${finalAttrs.version}";

    hash = "sha256-L9LVXyeA09aMtNf+b/Oo+eLpeVEKTD1/oNWCiFn5FbU=";

    hash = "sha256-Wdq+eXSaGs+y+75ZbxoNAcyopRkWRHHRm05T0SHBrow=";

  };



  enableParallelBuilding = true;
@@ -247,27 +246,6 @@ stdenv.mkDerivation (finalAttrs: { 
    platforms = platforms.darwin;

    hydraPlatforms = [ ]; # hydra can't build this as long as we rely on Xcode and sandboxProfile

    knownVulnerabilities = [

      "CVE-2023-46246"

      "CVE-2023-48231"

      "CVE-2023-48232"

      "CVE-2023-48233"

      "CVE-2023-48234"

      "CVE-2023-48235"

      "CVE-2023-48236"

      "CVE-2023-48237"

      "CVE-2023-48706"

      "CVE-2023-5344"

      "CVE-2023-5441"

      "CVE-2023-5535"

      "CVE-2024-22667"

      "CVE-2024-41957"

      "CVE-2024-41965"

      "CVE-2024-43374"

      "CVE-2024-47814"

      "CVE-2025-1215"

      "CVE-2025-22134"

      "CVE-2025-24014"

      "CVE-2025-26603"

      "CVE-2025-29768"

      "CVE-2025-53905"

      "CVE-2025-53906"

pkgs/applications/editors/vim/macvim.patch

+0 −13
Original line number Diff line number Diff line
@@ -199,16 +199,3 @@ index 6e33142..6185f45 100644 
 #ifdef AMIGA

 # include "os_amiga.h"

 #endif
 
diff --git a/src/vimtutor b/src/vimtutor

index 3b154f2..e89f260 100755

--- a/src/vimtutor

+++ b/src/vimtutor

@@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"

 if test "$1" = "-g"; then

     # Try to use the GUI version of Vim if possible, it will fall back

     # on Vim if Gvim is not installed.

-    seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"

+    seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"

     shift

 fi