diff options
author | Benjamin Hipple <bhipple@protonmail.com> | 2020-02-15 23:09:32 -0500 |
---|---|---|
committer | Benjamin Hipple <bhipple@protonmail.com> | 2020-02-15 23:09:32 -0500 |
commit | 31971254d70802d8c248dedc50882247824c3bb1 (patch) | |
tree | 1f1332ed5e70d1f907ebd23e678736f605291bf1 | |
parent | 6d881472ef7c6a592eda36c2783130dc03c678b9 (diff) | |
download | nixpkgs-31971254d70802d8c248dedc50882247824c3bb1.tar nixpkgs-31971254d70802d8c248dedc50882247824c3bb1.tar.gz nixpkgs-31971254d70802d8c248dedc50882247824c3bb1.tar.bz2 nixpkgs-31971254d70802d8c248dedc50882247824c3bb1.tar.lz nixpkgs-31971254d70802d8c248dedc50882247824c3bb1.tar.xz nixpkgs-31971254d70802d8c248dedc50882247824c3bb1.tar.zst nixpkgs-31971254d70802d8c248dedc50882247824c3bb1.zip |
wasm-gc: remove package
The upstream repository has been archived, with a note that this should never be needed: https://github.com/alexcrichton/wasm-gc It also happens to have custom patch logic that will fail the newer cargo verification in #79975
-rw-r--r-- | pkgs/development/interpreters/wasm-gc/default.nix | 28 | ||||
-rw-r--r-- | pkgs/development/interpreters/wasm-gc/fix-build.patch | 34 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 1 insertions, 65 deletions
diff --git a/pkgs/development/interpreters/wasm-gc/default.nix b/pkgs/development/interpreters/wasm-gc/default.nix deleted file mode 100644 index 585a90c505b..00000000000 --- a/pkgs/development/interpreters/wasm-gc/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "wasm-gc"; - version = "0.1.6"; - - src = fetchFromGitHub { - owner = "alexcrichton"; - repo = "wasm-gc"; - rev = version; - sha256 = "1lc30xxqp3vv1r269xzznh2lf2dzdq89bi5f1vmqjw4yc3xmawm7"; - }; - - cargoPatches = [ ./fix-build.patch ]; # Cargo.lock is not up-to-date - - # Delete this on next update; see #79975 for details - legacyCargoFetcher = true; - - cargoSha256 = "073dnn80sl4adh7vi6q9sx2vkmy27gxy7ysxz17iz12p7pfcagm2"; - - meta = with stdenv.lib; { - description = "gc-sections for wasm"; - homepage = "https://github.com/alexcrichton/wasm-gc"; - maintainers = with maintainers; [ ekleog ]; - platforms = platforms.all; - license = with licenses; [ mit asl20 ]; - }; -} diff --git a/pkgs/development/interpreters/wasm-gc/fix-build.patch b/pkgs/development/interpreters/wasm-gc/fix-build.patch deleted file mode 100644 index 3144dd89837..00000000000 --- a/pkgs/development/interpreters/wasm-gc/fix-build.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 923ed91..71f17c8 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -212,16 +212,16 @@ dependencies = [ - - [[package]] - name = "wasm-gc" --version = "0.1.1" -+version = "0.1.6" - dependencies = [ - "env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", - "getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-gc-api 0.1.5", -+ "wasm-gc-api 0.1.6", - ] - - [[package]] - name = "wasm-gc-api" --version = "0.1.5" -+version = "0.1.6" - dependencies = [ - "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-wasm 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -234,7 +234,7 @@ version = "0.1.0" - dependencies = [ - "cfg-if 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "wasm-bindgen 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "wasm-gc-api 0.1.5", -+ "wasm-gc-api 0.1.6", - ] - - [[package]] - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8192f56c1b..9d202271a23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9506,8 +9506,6 @@ in proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; - wasm-gc = callPackage ../development/interpreters/wasm-gc { }; - ### DEVELOPMENT / MISC @@ -11488,7 +11486,7 @@ in }; gdal = callPackage ../development/libraries/gdal { - pythonPackages = python3Packages; + pythonPackages = python3Packages; }; gdal_1_11 = callPackage ../development/libraries/gdal/gdal-1_11.nix { }; |