Created
August 20, 2024 19:31
-
-
Save marcusramberg/251d2f84d3ce933d83cf4726e1991333 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix | |
index bf2fb1fb02f7..b30fb0dac7b1 100644 | |
--- a/pkgs/applications/editors/vim/macvim.nix | |
+++ b/pkgs/applications/editors/vim/macvim.nix | |
@@ -8,7 +8,7 @@ | |
, cscope | |
, ruby_3_2 | |
, tcl | |
-, perl536 | |
+, perl540 | |
, luajit | |
, darwin | |
, libiconv | |
@@ -17,8 +17,7 @@ | |
# Try to match MacVim's documented script interface compatibility | |
let | |
- # Perl 5.30 - closest we get is 5.36. 5.38 is currently failing | |
- perl = perl536; | |
+ perl = perl540; | |
# Ruby 3.2 | |
ruby = ruby_3_2; | |
in | |
@@ -37,7 +36,7 @@ in | |
stdenv.mkDerivation (finalAttrs: { | |
pname = "macvim"; | |
- version = "178"; | |
+ version = "179"; | |
src = fetchFromGitHub { | |
owner = "macvim-dev"; | |
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix | |
index d2d53df71352..93caf0d3c60a 100644 | |
--- a/pkgs/servers/http/unit/default.nix | |
+++ b/pkgs/servers/http/unit/default.nix | |
@@ -3,8 +3,8 @@ | |
, withPython3 ? true, python3, ncurses | |
, withPHP81 ? true, php81 | |
, withPHP82 ? false, php82 | |
-, withPerl536 ? false, perl536 | |
-, withPerl538 ? true, perl538 | |
+, withPerl538 ? false, perl540 | |
+, withPerl540 ? true, perl538 | |
, withRuby_3_1 ? true, ruby_3_1 | |
, withRuby_3_2 ? false, ruby_3_2 | |
, withSSL ? true, openssl ? null | |
@@ -44,8 +44,8 @@ in stdenv.mkDerivation rec { | |
++ optionals withPython3 [ python3 ncurses ] | |
++ optional withPHP81 php81-unit | |
++ optional withPHP82 php82-unit | |
- ++ optional withPerl536 perl536 | |
++ optional withPerl538 perl538 | |
+ ++ optional withPerl540 perl540 | |
++ optional withRuby_3_1 ruby_3_1 | |
++ optional withRuby_3_2 ruby_3_2 | |
++ optional withSSL openssl; | |
@@ -66,8 +66,8 @@ in stdenv.mkDerivation rec { | |
${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} | |
${optionalString withPHP81 "./configure php --module=php81 --config=${php81-unit.unwrapped.dev}/bin/php-config --lib-path=${php81-unit}/lib"} | |
${optionalString withPHP82 "./configure php --module=php81 --config=${php82-unit.unwrapped.dev}/bin/php-config --lib-path=${php82-unit}/lib"} | |
- ${optionalString withPerl536 "./configure perl --module=perl536 --perl=${perl536}/bin/perl"} | |
${optionalString withPerl538 "./configure perl --module=perl538 --perl=${perl538}/bin/perl"} | |
+ ${optionalString withPerl540 "./configure perl --module=perl540 --perl=${perl540}/bin/perl"} | |
${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"} | |
${optionalString withRuby_3_2 "./configure ruby --module=ruby32 --ruby=${ruby_3_2}/bin/ruby"} | |
''; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment