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

actually use a recent nixpkgs

Browse source
This commit is contained in:
Anton-4 2023-04-25 18:38:15 +02:00
parent 36c67484b7
commit a97f877f85
No known key found for this signature in database
GPG key ID: 0971D718C0A9B937
4 changed files with 16 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/compiler/mono/src/ir.rs
View file

@ -63,7 +63,6 @@ pub fn pretty_print_ir_symbols() -> bool {
// if your changes cause this number to go down, great! // if your changes cause this number to go down, great!
// please change it to the lower number. // please change it to the lower number.
// if it went up, maybe check that the change is really required // if it went up, maybe check that the change is really required
roc_error_macros::assert_sizeof_wasm!(Literal, 24); roc_error_macros::assert_sizeof_wasm!(Literal, 24);
roc_error_macros::assert_sizeof_wasm!(Expr, 48); roc_error_macros::assert_sizeof_wasm!(Expr, 48);
roc_error_macros::assert_sizeof_wasm!(Stmt, 64); roc_error_macros::assert_sizeof_wasm!(Stmt, 64);
@ -72,8 +71,8 @@ roc_error_macros::assert_sizeof_wasm!(Call, 44);
roc_error_macros::assert_sizeof_wasm!(CallType, 36); roc_error_macros::assert_sizeof_wasm!(CallType, 36);
roc_error_macros::assert_sizeof_non_wasm!(Literal, 3 * 8); roc_error_macros::assert_sizeof_non_wasm!(Literal, 3 * 8);
roc_error_macros::assert_sizeof_non_wasm!(Expr, 9 * 8); roc_error_macros::assert_sizeof_non_wasm!(Expr, 10 * 8);
roc_error_macros::assert_sizeof_non_wasm!(Stmt, 12 * 8); roc_error_macros::assert_sizeof_non_wasm!(Stmt, 13 * 8);
roc_error_macros::assert_sizeof_non_wasm!(ProcLayout, 5 * 8); roc_error_macros::assert_sizeof_non_wasm!(ProcLayout, 5 * 8);
roc_error_macros::assert_sizeof_non_wasm!(Call, 9 * 8); roc_error_macros::assert_sizeof_non_wasm!(Call, 9 * 8);
roc_error_macros::assert_sizeof_non_wasm!(CallType, 7 * 8); roc_error_macros::assert_sizeof_non_wasm!(CallType, 7 * 8);

5
default.nix
View file

@ -6,9 +6,10 @@
, pkgs ? import nixpkgsSource { } , pkgs ? import nixpkgsSource { }
, ,
}: }:
# we only this file to release a nix package, use flake.nix for development # we only use this file to release a nix package, use flake.nix for development
let let
rustPlatform = pkgs.rustPlatform; rustPlatform = pkgs.rustPlatform;
llvmPkgs = pkgs.llvmPackages_13; llvmPkgs = pkgs.llvmPackages_13;
# nix does not store libs in /usr/lib or /lib # nix does not store libs in /usr/lib or /lib
nixGlibcPath = if pkgs.stdenv.isLinux then "${pkgs.glibc.out}/lib" else ""; nixGlibcPath = if pkgs.stdenv.isLinux then "${pkgs.glibc.out}/lib" else "";
@ -51,7 +52,7 @@ rustPlatform.buildRustPackage {
python3 python3
llvmPkgs.clang llvmPkgs.clang
llvmPkgs.llvm.dev llvmPkgs.llvm.dev
zig zig_0_9
]); ]);
buildInputs = (with pkgs; buildInputs = (with pkgs;

38
flake.lock generated
View file

@ -19,15 +19,12 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1659877975,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401", "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -38,7 +35,7 @@
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1681202837,
@ -77,11 +74,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1673796341, "lastModified": 1682362401,
"narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=", "narHash": "sha256-/UMUHtF2CyYNl4b60Z2y4wwTTdIWGKhj9H301EDcT9M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6dccdc458512abce8d19f74195bb20fdb067df50", "rev": "884ac294018409e0d1adc0cae185439a44bd6b0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -107,11 +104,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1682043560, "lastModified": 1682389182,
"narHash": "sha256-ZsF4Yee9pQbvLtwSVGgYux+az4yFSLXrxPyGHm3ptJM=", "narHash": "sha256-8t2nmFnH+8V48+IJsf8AK51ebXNlVbOSVYOpiqJKvJE=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "48037a6f8faeee138ede96bf607bc95c9dab9aec", "rev": "74f1a64dd28faeeb85ef081f32cad2989850322c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -149,21 +146,6 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_3": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

2
flake.nix
View file

@ -90,7 +90,7 @@
llvmPkgs.clang llvmPkgs.clang
libxkbcommon libxkbcommon
pkg-config pkg-config
zig # roc builtins are implemented in zig, see compiler/builtins/bitcode/ zig_0_9 # roc builtins are implemented in zig, see compiler/builtins/bitcode/
# lib deps # lib deps
libffi libffi