Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update shell.nix to nixpkgs-24.05 and LLVM 18 #14651

Merged
merged 17 commits into from
Nov 20, 2024
Merged

Update shell.nix to nixpkgs-24.05 and LLVM 18 #14651

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
336b1cc
Update to `nixpkgs-24.05`
straight-shoota May 10, 2024
70d8f90
Update LLVM 18
straight-shoota Jun 1, 2024
b84a32b
Merge branch 'master' into infra/shell.nix-nixpkgs-24.05
straight-shoota Aug 7, 2024
0d1ec22
Merge branch 'master' into infra/shell.nix-nixpkgs-24.05
straight-shoota Nov 4, 2024
dd8d8fe
Use `libiconvReal` on macOS
straight-shoota Nov 4, 2024
b522e37
Forward `CRYSTAL_OPTS` in `bin/ci`
straight-shoota Nov 4, 2024
f968d33
fixup
straight-shoota Nov 4, 2024
cc0af4d
Revert "fixup"
straight-shoota Nov 4, 2024
76d453a
Revert "Forward `CRYSTAL_OPTS` in `bin/ci`"
straight-shoota Nov 4, 2024
d2d37a3
Revert "Use `libiconvReal` on macOS"
straight-shoota Nov 4, 2024
132a6e7
Fix string encoding specs for darwin
straight-shoota Nov 4, 2024
130928b
Revert "Fix string encoding specs for darwin"
straight-shoota Nov 4, 2024
d6d6f88
Forward `CRYSTAL_OPTS` in `bin/ci`
straight-shoota Nov 4, 2024
260d286
fail-fast: false
straight-shoota Nov 4, 2024
d6883cb
CRYSTAL_OPTS=-Dwithout_encoding
straight-shoota Nov 4, 2024
eecf1b6
`-Dwithout_iconv`
straight-shoota Nov 5, 2024
0a665bc
Merge branch 'master' into infra/shell.nix-nixpkgs-24.05
straight-shoota Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use libiconvReal on macOS
  • Loading branch information
@straight-shoota
straight-shoota committed Nov 4, 2024
commit dd8d8fee1775463fd2bd90d706f4af9a7e5045c7
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
run: bin/ci prepare_build

- name: Test
run: bin/ci build
run: CRYSTAL_OPTS=-Duse_libiconv bin/ci build

- name: Test interpreter
run: bin/ci with_build_env 'make interpreter_spec'
run: bin/ci with_build_env 'CRYSTAL_OPTS=-Duse_libiconv make interpreter_spec'
2 changes: 1 addition & 1 deletion shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ let

stdLibDeps = with pkgs; [
boehmgc gmp libevent libiconv libxml2 libyaml openssl pcre2 zlib
] ++ lib.optionals stdenv.isDarwin [ libiconv ];
] ++ lib.optionals stdenv.isDarwin [ libiconvReal ];

tools = [ pkgs.hostname pkgs.git llvmPackages.bintools ] ++ pkgs.lib.optional (!llvmPackages.lldb.meta.broken) llvmPackages.lldb;
in
Expand Down
Loading