From 428ff5779ae6b4335f2c1edfb1a7969d013f9700 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sat, 27 Feb 2021 12:32:51 -0800 Subject: [PATCH 1/6] erlangR23: 23.1.4 -> 23.2.6 --- pkgs/development/interpreters/erlang/R23.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index 53d1b49c375..23a68b7ee85 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -3,8 +3,8 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "23.1.4"; - sha256 = "16ssxmrgjgvzg06aa1l4wz9rrdjfy39k22amgabxwb5if1g8bg8z"; + version = "23.2.6"; + sha256 = "sha256-G930sNbr8h5ryI/IE+J6OKhR5ij68ZhGo1YIEjSOwGU="; prePatch = '' substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" From 025f1c4c874aec7546a6044c4ebaac0ee83ce906 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sat, 27 Feb 2021 12:34:38 -0800 Subject: [PATCH 2/6] erlangR22: 22.3 -> 22.3.4.16 --- pkgs/development/interpreters/erlang/R22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index 7596ad9e2f1..59bd5a5d3f7 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -3,8 +3,8 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "22.3"; - sha256 = "0srbyncgnr1kp0rrviq14ia3h795b3gk0iws5ishv6rphcq1rs27"; + version = "22.3.4.16"; + sha256 = "sha256-V0RwEPfjnHtEzShNh6Q49yGC5fbt2mNR4xy6f6iWvck="; prePatch = '' substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" From 7993fc70af9e8e1b8b91ec93aecf3e98377d1e8a Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sat, 27 Feb 2021 12:34:56 -0800 Subject: [PATCH 3/6] erlangR21: 21.3.8.3 -> 21.3.8.21 --- pkgs/development/interpreters/erlang/R21.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index fdd034fc607..2fe58a76b03 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -1,8 +1,8 @@ { mkDerivation }: mkDerivation { - version = "21.3.8.3"; - sha256 = "1szybirrcpqsl2nmlmpbkxjqnm6i7l7bma87m5cpwi0kpvlxwmcw"; + version = "21.3.8.21"; + sha256 = "sha256-zQCs2hOA66jxAaxl/B42EKCejAktIav2rpVQCNyKCh4="; prePatch = '' substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" From a026ea9856021e8afb7dac044c010bb4af8b871f Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sat, 27 Feb 2021 12:26:17 -0800 Subject: [PATCH 4/6] erlang: add missing AGL framework for aarch64-darwin Preventing this: ``` LD ../priv/aarch64-apple-darwin20.3.0/wxe_driver.so ld: file not found: /System/Library/Frameworks/AGL.framework/Versions/A/AGL for architecture arm64 clang-11: error: linker command failed with exit code 1 (use -v to see invocation) make[3]: *** [Makefile:176: ../priv/aarch64-apple-darwin20.3.0/wxe_driver.so] Error 1 ``` --- pkgs/development/interpreters/erlang/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 110a93a3ba5..ee9e173e829 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation ({ ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages ++ optional withSystemd systemd - ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ Carbon Cocoa ]); + ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa ]); debugInfo = enableDebugInfo; From e96c9b30fa11aba581a1ec7f8f739ed6bcd8b96a Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Sun, 28 Feb 2021 11:58:22 -0800 Subject: [PATCH 5/6] erlang: add missing WebKit framework on darwin Fixing the following error: ``` LD ../priv/x86_64-apple-darwin20.3.0/wxe_driver.so ld: file not found: /System/Library/Frameworks/WebKit.framework/Versions/A/WebKit for architecture x86_64 clang-7: error: linker command failed with exit code 1 (use -v to see invocation) ``` --- pkgs/development/interpreters/erlang/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index ee9e173e829..632eb9c541a 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation ({ ++ optionals odbcSupport odbcPackages ++ optionals javacSupport javacPackages ++ optional withSystemd systemd - ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa ]); + ++ optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [ AGL Carbon Cocoa WebKit ]); debugInfo = enableDebugInfo; From 81aa7a13441b83d7ab8142380b613c9a1404556a Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Tue, 2 Mar 2021 12:55:32 -0800 Subject: [PATCH 6/6] erlangR23, erlangR22, erlangR21: remove obsolete substituteInPlace --- pkgs/development/interpreters/erlang/R21.nix | 4 ---- pkgs/development/interpreters/erlang/R22.nix | 5 ----- pkgs/development/interpreters/erlang/R23.nix | 5 ----- pkgs/development/interpreters/erlang/generic-builder.nix | 8 +------- 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R21.nix b/pkgs/development/interpreters/erlang/R21.nix index 2fe58a76b03..e1145090c86 100644 --- a/pkgs/development/interpreters/erlang/R21.nix +++ b/pkgs/development/interpreters/erlang/R21.nix @@ -3,8 +3,4 @@ mkDerivation { version = "21.3.8.21"; sha256 = "sha256-zQCs2hOA66jxAaxl/B42EKCejAktIav2rpVQCNyKCh4="; - - prePatch = '' - substituteInPlace configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" - ''; } diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index 59bd5a5d3f7..8bfe111f065 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -5,9 +5,4 @@ mkDerivation { version = "22.3.4.16"; sha256 = "sha256-V0RwEPfjnHtEzShNh6Q49yGC5fbt2mNR4xy6f6iWvck="; - - prePatch = '' - substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" - substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' "" - ''; } diff --git a/pkgs/development/interpreters/erlang/R23.nix b/pkgs/development/interpreters/erlang/R23.nix index 23a68b7ee85..8c07c09f221 100644 --- a/pkgs/development/interpreters/erlang/R23.nix +++ b/pkgs/development/interpreters/erlang/R23.nix @@ -5,9 +5,4 @@ mkDerivation { version = "23.2.6"; sha256 = "sha256-G930sNbr8h5ryI/IE+J6OKhR5ij68ZhGo1YIEjSOwGU="; - - prePatch = '' - substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" - substituteInPlace erts/configure.in --replace '-Wl,-no_weak_imports' "" - ''; } diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index 632eb9c541a..325d8e87e4a 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -64,13 +64,6 @@ in stdenv.mkDerivation ({ # On some machines, parallel build reliably crashes on `GEN asn1ct_eval_ext.erl` step enableParallelBuilding = parallelBuild; - # Clang 4 (rightfully) thinks signed comparisons of pointers with NULL are nonsense - prePatch = '' - substituteInPlace lib/wx/c_src/wxe_impl.cpp --replace 'temp > NULL' 'temp != NULL' - - ${prePatch} - ''; - postPatch = '' patchShebangs make @@ -132,6 +125,7 @@ in stdenv.mkDerivation ({ // optionalAttrs (preUnpack != "") { inherit preUnpack; } // optionalAttrs (postUnpack != "") { inherit postUnpack; } // optionalAttrs (patches != []) { inherit patches; } +// optionalAttrs (prePatch != "") { inherit prePatch; } // optionalAttrs (patchPhase != "") { inherit patchPhase; } // optionalAttrs (configurePhase != "") { inherit configurePhase; } // optionalAttrs (preConfigure != "") { inherit preConfigure; }