Skip to content

chore: bump nixpkgs to recently released #4793

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

Jump to bottom
Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

chore: bump nixpkgs to recently released #4793

wants to merge 20 commits into from

Conversation

ggreif
Copy link
Contributor

@ggreif ggreif commented Dec 3, 2024 •
edited
Loading

Gotchas:

Warning: Cache directories could not be created: Read-only file system;
disabling cache
Hint: Make sure the directory /homeless-shelter/.cache/dune/db/temp can be
created

Alert deprecated: module Stdlib.Stream
Use the camlp-streams library instead.

Turtle/Pipe.hs:50:64: warning: [GHC-68441] [-Wdeprecations]
    In the use of ‘encodeString’
    (imported from Turtle, but defined in Turtle.Internal):
    Deprecated: "Use id instead"

error: data-layout for target `wasm32-none-shared-4524303071672142626`,
    `e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-n32:64-S128-ni:1:10:20`,
differs from LLVM target's `wasm32-none-shared` default layout,
    `e-m:e-p:32:32-p10:8:8-p20:8:8-i64:64-i128:128-n32:64-S128-ni:1:10:20`

warning: target json file contains unused fields: default-hidden-visibility, is-builtin

warning: creating a shared reference to mutable static is discouraged
  --> src/continuation_table.rs:70:16
   |
70 |     assert_eq!(FREE_SLOT, old_size);
   |                ^^^^^^^^^ shared reference to mutable static

@ggreif ggreif self-assigned this Mar 22, 2025
@ggreif ggreif requested a review from a team as a code owner March 22, 2025 11:19
ggreif added 10 commits March 30, 2025 21:02
@ggreif
Merge branch 'master' into gabor/nixpkgs-24.11
2d507bd
@ggreif
WIP: very much so
a8d96dd
@ggreif
fixup
90cff3f
@ggreif
update
3b7d9bc
@ggreif
WIP: rts compiles, but does't link:
a5bd554 
```
wasm-ld -o mo-rts-non-incremental-debug.wasm \
	--import-memory --shared --no-entry --gc-sections --export=__wasm_call_ctors --export=__wasm_apply_data_relocs --export=memcmp --export=tan --export=asin --export=acos --export=atan --export=atan2 --export=pow --export=sin --export=cos --export=exp --export=fmod --export=log --whole-archive --experimental-pic \
	_build/wasm32/libmotoko_rts_debug.a _build/libtommath_wasm32.a
wasm-ld: error: symbol exported via --export not found: tan
wasm-ld: error: symbol exported via --export not found: asin
wasm-ld: error: symbol exported via --export not found: acos
wasm-ld: error: symbol exported via --export not found: atan
wasm-ld: error: symbol exported via --export not found: atan2
wasm-ld: error: symbol exported via --export not found: pow
wasm-ld: error: symbol exported via --export not found: sin
wasm-ld: error: symbol exported via --export not found: cos
wasm-ld: error: symbol exported via --export not found: exp
wasm-ld: error: symbol exported via --export not found: log
```
@ggreif
manually add transcendental and trigonomentric functions
c83feba 
not sure why this is necessary...
@ggreif
downgrade
5f62402
@ggreif
typo
116516a
@ggreif
update cargoVendorTools to find packages in nightly
7467189
@ggreif
update deps, targets, hashes
1788263 
this compiles and test apparently,
and is basis for upcoming iterations
ggreif
ggreif commented Mar 30, 2025
View reviewed changes
rts/motoko-rts/Cargo.toml Outdated
motoko-rts-macros = { path = "../motoko-rts-macros" }
unicode-ident = "=1.0.16"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we get rid of this?

ggreif
ggreif commented Mar 30, 2025
View reviewed changes
rts/motoko-rts/src/float.rs
@@ -38,3 +38,26 @@ fn written_length(buffer: &[u8]) -> usize {
}
buffer.len()
}

#[no_mangle]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how were these part of the library before?

ggreif
ggreif commented Mar 30, 2025
View reviewed changes
rts/motoko-rts/src/lib.rs
@@ -7,7 +7,8 @@
proc_macro_hygiene,
// // We do not need simd but this flag enables `core::arch:wasm64`.
// // See https://github.com/rust-lang/rust/issues/90599
simd_wasm64
simd_wasm64,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed?
Note: There is a SIMD-Cargo.toml in the lib/rustlib/src/rust/library/portable-simd of the nightly

@ggreif ggreif force-pushed the gabor/nixpkgs-24.11 branch from 6dc38ef to 8f8b2e6 Compare March 30, 2025 23:58
ggreif
ggreif commented Mar 31, 2025
View reviewed changes
nix/default.nix
# (self: super: {
# rustPlatform_moz_stable = self.makeRustPlatform rec {
# rustcX = super.rustc;
# rustc = self.moz_overlay.latest.rustChannels.stable.rust // { targetPlatforms = super.rustc.targetPlatforms; badTargetPlatforms = super.rustc.badTargetPlatforms; };
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

which version would this be?

ggreif
ggreif commented Mar 31, 2025
View reviewed changes
nix/sources.json
"description": "Nix Packages collection & NixOS",
"homepage": "",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0da3c44a9460a26d2025ec3ed2ec60a895eb1114",
"sha256": "1n435wya14pbl04g6n4zrqaslpik4xq0fv1i2g2mz8sq3dqg7dk0",
"rev": "afafb10992acc83f62461068e42a295586b89581",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re-bump this!

ggreif
ggreif commented Mar 31, 2025
View reviewed changes
rts/motoko-rts/Cargo.toml
@@ -36,7 +36,9 @@ enhanced_orthogonal_persistence = ["incremental_gc"]

[dependencies]
libc = { version = "0.2.139", default-features = false, optional = true }
libm = "=0.2.7"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pins it. Done by cargo add libm@=0.2.7, because we only have a few versions available, following the vendoring of the crates that the nightly pulls in.

ggreif
ggreif commented Apr 1, 2025
View reviewed changes
nix/default.nix
rustc = rustc-nightly;
cargo = cargo-nightly;
rustPlatform-nightly = self.makeRustPlatform rec {
rustcX = super.rustc;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
rustcX = super.rustc;

remove

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ggreif ggreif

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ggreif