Skip to content
This repository has been archived by the owner on Nov 2, 2023. It is now read-only.

Commit

Permalink
Switch to experimental version of naersk
Browse files Browse the repository at this point in the history
Without this the Nix build is currently failing, because the stable
naersk has a bug related to using git dependencies in crate overrides,
see:

nix-community/naersk#152

Fixing to the naersk in this PR fixed things:

nix-community/naersk#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.
  • Loading branch information
jwoudenberg committed Jan 17, 2022
1 parent 59cf46e commit 821423d
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 32 deletions.
48 changes: 24 additions & 24 deletions elm-pair/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions elm-pair/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 6 additions & 5 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
fenix.url = "github:nix-community/fenix";
fenix.inputs.nixpkgs.follows = "nixpkgs";
Expand Down

0 comments on commit 821423d

Please sign in to comment.