cadey
/
tron
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix build 

Signed-off-by: Christine Dodrill <me@christine.website>
This commit is contained in:
Cadey Ratio 2021-07-14 21:40:02 -04:00
parent 88df80f304
commit 20e69676d9
5 changed files with 740 additions and 444 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1147
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
Cargo.toml
View File

@ -16,7 +16,7 @@ log = "0.4"
pretty_env_logger = "0.4" pretty_env_logger = "0.4"
regex = "1" regex = "1"
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
serde_dhall = "0.5.3" serde_dhall = "0.10"
tokio = { version = "0.2", features = ["macros"] } tokio = { version = "0.2", features = ["macros"] }
# git deps # git deps

3
default.nix
View File

@ -1,4 +1,5 @@
{ sources ? import ./nix/sources.nix, pkgs ? import sources.nixpkgs { } { sources ? import ./nix/sources.nix, pkgs ?
import sources.nixpkgs { overlays = [ (import sources.nixpkgs-mozilla) ]; }
, naersk ? pkgs.callPackage sources.naersk { } }: , naersk ? pkgs.callPackage sources.naersk { } }:
let let

24
nix/sources.json
View File

@ -17,10 +17,10 @@
"homepage": "", "homepage": "",
"owner": "nmattia", "owner": "nmattia",
"repo": "naersk", "repo": "naersk",
"rev": "4f7426c362809e472d03c369d3674317c32b6863", "rev": "e09c320446c5c2516d430803f7b19f5833781337",
"sha256": "1c0f2c4gkfmrpykmk25ck8x17nq7l14di8vvxlibbigzy5jacdaf", "sha256": "0k1pk2ixnxl6njjrgy750gm6m1nkkdsah383n3wp4ybrzacnav5h",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nmattia/naersk/archive/4f7426c362809e472d03c369d3674317c32b6863.tar.gz", "url": "https://github.com/nmattia/naersk/archive/e09c320446c5c2516d430803f7b19f5833781337.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"niv": { "niv": {
@ -29,10 +29,10 @@
"homepage": "https://github.com/nmattia/niv", "homepage": "https://github.com/nmattia/niv",
"owner": "nmattia", "owner": "nmattia",
"repo": "niv", "repo": "niv",
"rev": "527494090f7075ed5e3aa15ef7093846e5e25d52", "rev": "e0ca65c81a2d7a4d82a189f1e23a48d59ad42070",
"sha256": "1hahf0i0iix1iyzaaq5a7rbgyfm3xjcfl69lm1b5mas1p8vdimih", "sha256": "1pq9nh1d8nn3xvbdny8fafzw87mj7gsmp6pxkdl65w2g18rmcmzx",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nmattia/niv/archive/527494090f7075ed5e3aa15ef7093846e5e25d52.tar.gz", "url": "https://github.com/nmattia/niv/archive/e0ca65c81a2d7a4d82a189f1e23a48d59ad42070.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs": { "nixpkgs": {
@ -46,5 +46,17 @@
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs-channels/archive/502845c3e31ef3de0e424f3fcb09217df2ce6df6.tar.gz", "url": "https://github.com/NixOS/nixpkgs-channels/archive/502845c3e31ef3de0e424f3fcb09217df2ce6df6.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-mozilla": {
"branch": "master",
"description": "mozilla related nixpkgs (extends nixos/nixpkgs repo)",
"homepage": "",
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"rev": "3f3fba4e2066f28a1ad7ac60e86a688a92eb5b5f",
"sha256": "1mrj89gzrzhci4lssvzmmk31l715cddp7l39favnfs1qaijly814",
"type": "tarball",
"url": "https://github.com/mozilla/nixpkgs-mozilla/archive/3f3fba4e2066f28a1ad7ac60e86a688a92eb5b5f.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }

8
shell.nix
View File

@ -1,13 +1,11 @@
{ sources ? import ./nix/sources.nix, pkgs ? import sources.nixpkgs { } { sources ? import ./nix/sources.nix
, pkgs ? import sources.nixpkgs { overlays = [ (import sources.nixpkgs-mozilla) ]; }
, dhall ? import sources.easy-dhall-nix { } }: , dhall ? import sources.easy-dhall-nix { } }:
pkgs.mkShell { pkgs.mkShell {
buildInputs = with pkgs; [ buildInputs = with pkgs; [
cargo latest.rustChannels.nightly.rust
cargo-watch cargo-watch
rls
rustc
rustfmt
# dhall # dhall
dhall.dhall-simple dhall.dhall-simple