language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 22:09:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

update flake so that rust 1.65 is used for default.nix, macos clippy fixes

Browse source
This commit is contained in:
Anton-4 2023-01-17 18:44:24 +01:00
parent 88f218d24f
commit 73f46b6613
No known key found for this signature in database
GPG key ID: 0971D718C0A9B937
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/compiler/build/src/link.rs
View file

@ -377,7 +377,7 @@ pub fn build_zig_host_native(
use serde_json::Value; use serde_json::Value;
// Run `zig env` to find the location of zig's std/ directory // Run `zig env` to find the location of zig's std/ directory
let zig_env_output = zig().args(&["env"]).output().unwrap(); let zig_env_output = zig().args(["env"]).output().unwrap();
let zig_env_json = if zig_env_output.status.success() { let zig_env_json = if zig_env_output.status.success() {
std::str::from_utf8(&zig_env_output.stdout).unwrap_or_else(|utf8_err| { std::str::from_utf8(&zig_env_output.stdout).unwrap_or_else(|utf8_err| {
@ -417,19 +417,19 @@ pub fn build_zig_host_native(
let mut zig_cmd = zig(); let mut zig_cmd = zig();
zig_cmd zig_cmd
.env_clear() .env_clear()
.env("PATH", &env_path) .env("PATH", env_path)
.env("HOME", &env_home); .env("HOME", env_home);
if let Some(shared_lib_path) = shared_lib_path { if let Some(shared_lib_path) = shared_lib_path {
zig_cmd.args(&[ zig_cmd.args([
"build-exe", "build-exe",
"-fPIE", "-fPIE",
shared_lib_path.to_str().unwrap(), shared_lib_path.to_str().unwrap(),
builtins_host_path.to_str().unwrap(), builtins_host_path.to_str().unwrap(),
]); ]);
} else { } else {
zig_cmd.args(&["build-obj"]); zig_cmd.args(["build-obj"]);
} }
zig_cmd.args(&[ zig_cmd.args([
zig_host_src, zig_host_src,
&format!("-femit-bin={}", emit_bin), &format!("-femit-bin={}", emit_bin),
"--pkg-begin", "--pkg-begin",
@ -446,9 +446,9 @@ pub fn build_zig_host_native(
"c", "c",
]); ]);
if matches!(opt_level, OptLevel::Optimize) { if matches!(opt_level, OptLevel::Optimize) {
zig_cmd.args(&["-O", "ReleaseSafe"]); zig_cmd.args(["-O", "ReleaseSafe"]);
} else if matches!(opt_level, OptLevel::Size) { } else if matches!(opt_level, OptLevel::Size) {
zig_cmd.args(&["-O", "ReleaseSmall"]); zig_cmd.args(["-O", "ReleaseSmall"]);
} }
zig_cmd zig_cmd

18
flake.lock generated
View file

@ -53,11 +53,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1661367362, "lastModified": 1672992692,
"narHash": "sha256-Qc8MXcV+YCPREu8kk6oggk23ZBKLqeQRAIsLbHEviPE=", "narHash": "sha256-/eLQLSNIa22ARTZbk+x8i0iE8khe1eiHWkuxgTVXZ7g=",
"owner": "guibou", "owner": "guibou",
"repo": "nixGL", "repo": "nixGL",
"rev": "7165ffbccbd2cf4379b6cd6d2edd1620a427e5ae", "rev": "643e730efb981ffaf8478f441ec9b9aeea1c89f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -68,11 +68,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1667901915, "lastModified": 1673796341,
"narHash": "sha256-IkSou5ox/yZ2YUhGpk8vxd2TNU2pwRlYtir5k55NaxE=", "narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "093268502280540a7f5bf1e2a6330a598ba3b7d0", "rev": "6dccdc458512abce8d19f74195bb20fdb067df50",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -98,11 +98,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1667962118, "lastModified": 1673922364,
"narHash": "sha256-RJi/HxlFxxJr1VeM3LLwrrRhiDGza+gphDMzt9QUS+M=", "narHash": "sha256-U0XIY/Y/x4fFtlCZKMtWlqOYUnLiXj4F42GQHxWuPow=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "91af035847a74cbd49ce9f764f8ef5fc641cb9b0", "rev": "4e0f9b8a5102387f8d19901bced16a256a6ccdc7",
"type": "github" "type": "github"
}, },
"original": { "original": {