public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #114180 from omasanori/wasm-pack-update-deps

This commit is contained in:
Sandro 2021-02-26 18:49:54 +01:00 committed by GitHub
parent 3a2195b750 556a725173
commit a859f27d61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3630 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/libressl/default.nix
View File

@ -63,11 +63,6 @@ let
}; };
in { in {
libressl_3_0 = generic {
version = "3.0.2";
sha256 = "13ir2lpxz8y1m151k7lrx306498nzfhwlvgkgv97v5cvywmifyyz";
};
libressl_3_1 = generic { libressl_3_1 = generic {
version = "3.1.4"; version = "3.1.4";
sha256 = "1dnbbnr43jashxivnafmh9gnn57c7ayva788ba03z633k6f18k21"; sha256 = "1dnbbnr43jashxivnafmh9gnn57c7ayva788ba03z633k6f18k21";

6
pkgs/development/tools/wasm-pack/default.nix
View File

@ -18,7 +18,11 @@ rustPlatform.buildRustPackage rec {
sha256 = "1rqyfg6ajxxyfx87ar25nf5ck9hd0p12qgv98dicniqag8l4rvsr"; sha256 = "1rqyfg6ajxxyfx87ar25nf5ck9hd0p12qgv98dicniqag8l4rvsr";
}; };
cargoSha256 = "0fw04hgxxqsbp1pylp32yd087r9bb8bpa05v90qdshkgp6znfl9s"; cargoPatches = [
./update-deps.patch
];
cargoSha256 = "0br7r8wz3knzgl3gjpq6z8w33my0yiaq711s1wih9jizhia02y5r";
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

3625
pkgs/development/tools/wasm-pack/update-deps.patch Normal file
View File

File diff suppressed because it is too large Load Diff

4
pkgs/top-level/all-packages.nix
View File

@ -16252,7 +16252,6 @@ in
openvdb = callPackage ../development/libraries/openvdb {}; openvdb = callPackage ../development/libraries/openvdb {};
inherit (callPackages ../development/libraries/libressl { }) inherit (callPackages ../development/libraries/libressl { })
libressl_3_0
libressl_3_1; libressl_3_1;
# Please keep this pointed to the latest version. See also # Please keep this pointed to the latest version. See also
@ -29674,9 +29673,6 @@ in
wasmer = callPackage ../development/interpreters/wasmer { }; wasmer = callPackage ../development/interpreters/wasmer { };
wasm-pack = callPackage ../development/tools/wasm-pack { wasm-pack = callPackage ../development/tools/wasm-pack {
# Wasm-pack depends on a version of rust-openssl which is incompatible with
# LibreSSL 3.1, so we explicitly opt for the older version.
libressl = libressl_3_0;
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };