From c1e349bc1b2d8edfb57e92419752277a5949ea86 Mon Sep 17 00:00:00 2001 From: Jasper Woudenberg Date: Wed, 12 Jan 2022 18:30:37 +0100 Subject: [PATCH] Switch to experimental version of naersk Without this the Nix build is currently failing, because the stable naersk has a bug related to using git dependencies in crate overrides, see: https://github.com/nix-community/naersk/issues/152 Fixing to the naersk in this PR fixed things: https://github.com/nix-community/naersk/pull/167 This should be a short-lived changed. I hope to either get my PR for the abomonation library merged which would make the crate override unnecessary. Should it not get merged I'll likely abandon my abomonation fork for some alternative solution. --- elm-pair/Cargo.lock | 48 ++++++++++++++++++++++----------------------- elm-pair/Cargo.toml | 4 ++-- flake.lock | 11 ++++++----- flake.nix | 2 +- 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/elm-pair/Cargo.lock b/elm-pair/Cargo.lock index 521c8d4..05f0d83 100644 --- a/elm-pair/Cargo.lock +++ b/elm-pair/Cargo.lock @@ -5,7 +5,7 @@ version = 3 [[package]] name = "abomonation" version = "0.7.3" -source = "git+https://github.com/jwoudenberg/abomonation?branch=master#adbc51eb87db5d84c319a2b175c544e7faab83dc" +source = "git+http://github.com/jwoudenberg/abomonation?branch=master#c370fca11c0cb08fdbc8451241e31765b53ad457" [[package]] name = "abomonation_derive" @@ -59,9 +59,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" dependencies = [ "cfg-if", "crossbeam-utils", @@ -69,9 +69,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" dependencies = [ "cfg-if", "lazy_static", @@ -151,9 +151,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fsevent-sys" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0e564d24da983c053beff1bb7178e237501206840a3e6bf4e267b9e8ae734a" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" dependencies = [ "libc", ] @@ -360,18 +360,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "proc-macro2" -version = "1.0.34" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f84e92c0f7c9d58328b85a78557813e4bd845130db68d7184635344399423b1" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ "unicode-xid", ] [[package]] name = "quote" -version = "1.0.10" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" dependencies = [ "proc-macro2", ] @@ -424,9 +424,9 @@ dependencies = [ [[package]] name = "ropey" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9150aff6deb25b20ed110889f070a678bcd1033e46e5e9d6fb1abeab17947f28" +checksum = "e6b9aa65bcd9f308d37c7158b4a1afaaa32b8450213e20c9b98e7d5b3cc2fec3" dependencies = [ "smallvec", ] @@ -448,18 +448,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9875c23cf305cd1fd7eb77234cbb705f21ea6a72c637a5c6db5fe4b8e7f008" +checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc0db5cb2556c0e558887d9bbdcf6ac4471e83ff66cf696e5419024d1606276" +checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537" dependencies = [ "proc-macro2", "quote", @@ -468,9 +468,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.73" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcbd0344bc6533bc7ec56df11d42fb70f1b912351c0825ccb7211b59d8af7cf5" +checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142" dependencies = [ "itoa", "ryu", @@ -491,9 +491,9 @@ checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" [[package]] name = "syn" -version = "1.0.84" +version = "1.0.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb2e6da8ee5eb9a61068762a32fa9619cc591ceb055b3687f4cd4051ec2e06b" +checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" dependencies = [ "proc-macro2", "quote", @@ -560,9 +560,9 @@ checksum = "f9046af28827ac831479d245eb8afd9522599a3cbb22d6c42a82cb9e4ccdf858" [[package]] name = "tree-sitter" -version = "0.20.1" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9394e9dbfe967b5f3d6ab79e302e78b5fb7b530c368d634ff3b8d67ede138bf1" +checksum = "c36be3222512d85a112491ae0cc280a38076022414f00b64582da1b7565ffd82" dependencies = [ "cc", "regex", @@ -571,7 +571,7 @@ dependencies = [ [[package]] name = "tree-sitter-elm" version = "5.4.0" -source = "git+https://github.com/jwoudenberg/tree-sitter-elm?branch=main#c9c2ed86515fd577a96bd2bad0918b0bca10177e" +source = "git+http://github.com/jwoudenberg/tree-sitter-elm?branch=main#c9c2ed86515fd577a96bd2bad0918b0bca10177e" dependencies = [ "cc", "tree-sitter", diff --git a/elm-pair/Cargo.toml b/elm-pair/Cargo.toml index f12a3a6..e8f267e 100644 --- a/elm-pair/Cargo.toml +++ b/elm-pair/Cargo.toml @@ -20,10 +20,10 @@ serde = { version = "^1.0.131", features = ["derive"] } serde_json = "^1.0.73" timely = "^0.12.0" tree-sitter = "^0.20.1" -tree-sitter-elm = { git = "https://github.com/jwoudenberg/tree-sitter-elm", branch = "main" } +tree-sitter-elm = { git = "http://github.com/jwoudenberg/tree-sitter-elm", branch = "main" } [patch.crates-io] -abomonation = { git = "https://github.com/jwoudenberg/abomonation", branch = "master" } +abomonation = { git = "http://github.com/jwoudenberg/abomonation", branch = "master" } [[bin]] name = "elm-pair" diff --git a/flake.lock b/flake.lock index 6bbc979..9e748a6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,15 +7,16 @@ ] }, "locked": { - "lastModified": 1639947939, - "narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=", - "owner": "nix-community", + "lastModified": 1641554901, + "narHash": "sha256-XCasyYec3EOz+uwwBV733QbRD9eEYizIuR0MUvQ3DxE=", + "owner": "yusdacra", "repo": "naersk", - "rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653", + "rev": "8616a0dc9f4f87f6cb8b55c91bc2bd69bc12ba03", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "yusdacra", + "ref": "feat/cargolock-git-deps", "repo": "naersk", "type": "github" } diff --git a/flake.nix b/flake.nix index 3920d6e..31f4192 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; utils.url = "github:numtide/flake-utils"; - naersk.url = "github:nix-community/naersk"; + naersk.url = "github:yusdacra/naersk/feat/cargolock-git-deps"; naersk.inputs.nixpkgs.follows = "nixpkgs"; };