Unverified Commit 6c72ee0f authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #232114 from ipetkov/wasm-pack-0.11.1 

wasm-pack: 0.11.0 -> 0.11.1
parents 5bb24e21 5c6f7afd

pkgs/development/tools/wasm-pack/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -9,16 +9,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "wasm-pack";

  version = "0.11.0";

  version = "0.11.1";



  src = fetchFromGitHub {

    owner = "rustwasm";

    repo = "wasm-pack";

    rev = "v${version}";

    sha256 = "sha256-3iwXoYnmrZsbwFUR41uI/4jnCF0OjeRO7UqVDaGJJbQ=";

    sha256 = "sha256-oIMS0kln+HCW9kFfLU+Vi0/4EYKYzzlA1BQHZNQkJMI=";

  };



  cargoHash = "sha256-Z0hmJ4/o9DNYz3JVXGgaDfw1JNcvvTCLngmhIDiVR6E=";

  cargoHash = "sha256-l6zn714DMQ+frU9Mppz4LuGY6Zf9qmxZ9MuwIvYvQMU=";



  nativeBuildInputs = [ pkg-config ];

pkgs/servers/ldap/lldap/default.nix

+1 −10
Original line number Diff line number Diff line
@@ -15,15 +15,6 @@ 


let



  # version of wasm-opt, with https://github.com/rustwasm/wasm-pack/pull/1257 backported

  wasm-pack-git = wasm-pack.overrideAttrs (oldAttrs: {

    version = oldAttrs.version + "-git";

    patches = [(fetchpatch {

      url = "https://patch-diff.githubusercontent.com/raw/rustwasm/wasm-pack/pull/1257.patch";

      sha256 = "sha256-npi9ewh0NaD67crTcje9AYxaLLOJOMzqjqEJXZF2LbQ=";

    })];

  });



  # replace with upstream wasm rustc, after resolution of

  # https://github.com/NixOS/nixpkgs/issues/89426

  rustc-wasm = (rustc.override {
@@ -74,7 +65,7 @@ let 
    pname = commonDerivationAttrs.pname + "-frontend";



    nativeBuildInputs = [

      wasm-pack-git wasm-bindgen-cli binaryen which rustc-wasm rustc-wasm.llvmPackages.lld

      wasm-pack wasm-bindgen-cli binaryen which rustc-wasm rustc-wasm.llvmPackages.lld

    ];



    buildPhase = ''