Merge pull request #139368 from figsoda/fix-supertag

supertag: fix build caused by outdated lexical-core

authored by figsoda and committed by GitHub a1fe966e e456e9b1

+32 -1
+27
pkgs/tools/filesystems/supertag/cargo-lock-update-lexical-core.patch
··· 1 + --- a/Cargo.lock 2 + +++ b/Cargo.lock 3 + @@ -1,5 +1,7 @@ 4 + # This file is automatically @generated by Cargo. 5 + # It is not intended for manual editing. 6 + +version = 3 7 + + 8 + [[package]] 9 + name = "adler32" 10 + version = "1.2.0" 11 + @@ -530,13 +532,13 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" 12 + 13 + [[package]] 14 + name = "lexical-core" 15 + -version = "0.7.4" 16 + +version = "0.7.6" 17 + source = "registry+https://github.com/rust-lang/crates.io-index" 18 + -checksum = "db65c6da02e61f55dae90a0ae427b2a5f6b3e8db09f58d10efab23af92592616" 19 + +checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" 20 + dependencies = [ 21 + "arrayvec", 22 + "bitflags 1.2.1", 23 + - "cfg-if 0.1.10", 24 + + "cfg-if 1.0.0", 25 + "ryu", 26 + "static_assertions", 27 + ]
+5 -1
pkgs/tools/filesystems/supertag/default.nix
··· 14 14 sha256 = "0jzm7pn38hlr96n0z8gqfsfdbw48y0nnbsgjdq7hpgwmcgvgqdam"; 15 15 }; 16 16 17 - cargoSha256 = "093vrpp4in8854hb0h1lxrp8v6i9vfja0l69dnnp7z15qkpbir4f"; 17 + # lexical-core is outdated and incompatible with newer versions of rust 18 + # patches Cargo.lock to include a more up-to-date version of lexical-core 19 + cargoPatches = [ ./cargo-lock-update-lexical-core.patch ]; 20 + 21 + cargoSha256 = "sha256-W5Emkbe1jI9Z+irMckD/3gJO47rACa9E5k5dqAFC1yQ="; 18 22 19 23 LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; 20 24