Merge staging-next into staging

2021-04-28 12:06:40 +00:00
parent 6e14f9eaec a0b098710b
commit ce47d859f6
13 changed files with 174 additions and 53 deletions
@@ -3,6 +3,6 @@
 # How to obtain `sha256`:
 # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
 mkDerivation {
-  version = "23.3.1";
-  sha256 = "1nx9yv3l8hf37js7pqs536ywy786mxhkqba1jsmy1b3yc6xki1mq";
+  version = "23.3.2";
+  sha256 = "eU3BmBJqrcg3FmkuAIfB3UoSNfQQfvGNyC2jBffwm/w=";
 }
@@ -192,7 +192,7 @@ let
              "--with-libxml-dir=${libxml2.dev}"
            ]
            ++ lib.optional pharSupport   "--enable-phar"
-            ++ lib.optional phpdbgSupport "--enable-phpdbg"
+            ++ lib.optional (!phpdbgSupport) "--disable-phpdbg"


            # Misc flags