78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
|
From b6910512a0789390af9db312ee8f08665bd662ab Mon Sep 17 00:00:00 2001
|
||
|
|
From: Joe Neeman <joeneeman@gmail.com>
|
||
|
|
Date: Mon, 15 May 2023 12:36:46 -0500
|
||
|
|
Subject: [PATCH] wasm-bindgen-cli: 0.2.84 -> 0.2.87
|
||
|
|
|
||
|
|
Also allow overriding the version
|
||
|
|
---
|
||
|
|
.../tools/wasm-bindgen-cli/default.nix | 15 +++++++--------
|
||
|
|
pkgs/servers/ldap/lldap/default.nix | 8 +++++++-
|
||
|
|
2 files changed, 14 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix
|
||
|
|
index ec336d422ab162..d7b6aba2a2a3a5 100644
|
||
|
|
--- a/pkgs/development/tools/wasm-bindgen-cli/default.nix
|
||
|
|
+++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix
|
||
|
|
@@ -7,28 +7,27 @@
|
||
|
|
, stdenv
|
||
|
|
, curl
|
||
|
|
, Security
|
||
|
|
-, runCommand
|
||
|
|
+, version ? "0.2.87"
|
||
|
|
+, hash ? "sha256-0u9bl+FkXEK2b54n7/l9JOCtKo+pb42GF9E1EnAUQa0="
|
||
|
|
+, cargoHash ? "sha256-AsZBtE2qHJqQtuCt/wCAgOoxYMfvDh8IzBPAOkYSYko="
|
||
|
|
}:
|
||
|
|
|
||
|
|
rustPlatform.buildRustPackage rec {
|
||
|
|
pname = "wasm-bindgen-cli";
|
||
|
|
- version = "0.2.84";
|
||
|
|
+ inherit version hash cargoHash;
|
||
|
|
|
||
|
|
src = fetchCrate {
|
||
|
|
- inherit pname version;
|
||
|
|
- sha256 = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk=";
|
||
|
|
+ inherit pname version hash;
|
||
|
|
};
|
||
|
|
|
||
|
|
- cargoSha256 = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50=";
|
||
|
|
-
|
||
|
|
nativeBuildInputs = [ pkg-config ];
|
||
|
|
|
||
|
|
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ];
|
||
|
|
|
||
|
|
nativeCheckInputs = [ nodejs ];
|
||
|
|
|
||
|
|
- # other tests require it to be ran in the wasm-bindgen monorepo
|
||
|
|
- cargoTestFlags = [ "--test=interface-types" ];
|
||
|
|
+ # tests require it to be ran in the wasm-bindgen monorepo
|
||
|
|
+ doCheck = false;
|
||
|
|
|
||
|
|
meta = with lib; {
|
||
|
|
homepage = "https://rustwasm.github.io/docs/wasm-bindgen/";
|
||
|
|
diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix
|
||
|
|
index 1948ca015dda83..93bf09add84905 100644
|
||
|
|
--- a/pkgs/servers/ldap/lldap/default.nix
|
||
|
|
+++ b/pkgs/servers/ldap/lldap/default.nix
|
||
|
|
@@ -32,6 +32,12 @@ let
|
||
|
|
configureFlags = attrs.configureFlags ++ ["--set=build.docs=false"];
|
||
|
|
});
|
||
|
|
|
||
|
|
+ wasm-bindgen-84 = wasm-bindgen-cli.override {
|
||
|
|
+ version = "0.2.84";
|
||
|
|
+ hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk=";
|
||
|
|
+ cargoHash = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50=";
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
commonDerivationAttrs = rec {
|
||
|
|
pname = "lldap";
|
||
|
|
version = "0.4.3";
|
||
|
|
@@ -65,7 +71,7 @@ let
|
||
|
|
pname = commonDerivationAttrs.pname + "-frontend";
|
||
|
|
|
||
|
|
nativeBuildInputs = [
|
||
|
|
- wasm-pack wasm-bindgen-cli binaryen which rustc-wasm rustc-wasm.llvmPackages.lld
|
||
|
|
+ wasm-pack wasm-bindgen-84 binaryen which rustc-wasm rustc-wasm.llvmPackages.lld
|
||
|
|
];
|
||
|
|
|
||
|
|
buildPhase = ''
|