From 6d662c52e53198d6cda3b2456835ad0364f3101f Mon Sep 17 00:00:00 2001 From: Will Cohen Date: Mon, 4 Aug 2025 10:51:46 -0400 Subject: [PATCH] emscripten: 4.0.11 -> 4.0.12 --- pkgs/development/compilers/emscripten/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 914fd143e323..6757fbcfd17c 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "4.0.11"; + version = "4.0.12"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - hash = "sha256-QNbXgTkzI0fqvg3nU2TAE8A8h6MNMm2TsTzOXBdpqYA="; + hash = "sha256-MwCUilfyum1yJb6nHEViYiYWufXlz2+krHZmXw2NAck="; rev = version; }; @@ -68,8 +68,8 @@ stdenv.mkDerivation rec { patchShebangs . - # emscripten 4 requires LLVM tip-of-tree instead of LLVM 20 - sed -i -e "s/EXPECTED_LLVM_VERSION = 21/EXPECTED_LLVM_VERSION = 20.1/g" tools/shared.py + # emscripten 4.0.12 requires LLVM tip-of-tree instead of LLVM 21 + sed -i -e "s/EXPECTED_LLVM_VERSION = 22/EXPECTED_LLVM_VERSION = 21.1/g" tools/shared.py # fixes cmake support sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab76551da97f..736e6286d111 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2851,7 +2851,7 @@ with pkgs; buildEmscriptenPackage = callPackage ../development/em-modules/generic { }; emscripten = callPackage ../development/compilers/emscripten { - llvmPackages = llvmPackages_20; + llvmPackages = llvmPackages_21; }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { });