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.

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

Use nixpkgs 21.05 #2532

Merged
merged 38 commits into from
May 28, 2021
Merged

Use nixpkgs 21.05 #2532

merged 38 commits into from
May 28, 2021

Conversation

nomeata
Copy link
Collaborator

@nomeata nomeata commented May 17, 2021

to see what breaks, and also to get
NixOS/nixpkgs@5a923e5
which may allow us to use rustc from nixpkgs again (see #2519)

Issues encountered:

@dfinity-ci
Copy link

This PR does not affect the produced WebAssembly code.

@nomeata nomeata marked this pull request as ready for review May 27, 2021 12:29
@nomeata nomeata added the automerge-squash When ready, merge (using squash) label May 27, 2021
@nomeata
Copy link
Collaborator Author

nomeata commented May 27, 2021

Claudio wants to test this, so don’t merge before. Might be nice if someone on OSX would test using the nix-shell?

@nomeata nomeata requested a review from crusso May 27, 2021 12:37
@nomeata nomeata removed the automerge-squash When ready, merge (using squash) label May 27, 2021
@ggreif
Copy link
Contributor

ggreif commented May 27, 2021

Hmm, my Mac exhibits the same failure mode as the hydra:

/nix/store/9xawf09c90761xkxv8r1b55ja46x4wr3-cctools-binutils-darwin-949.0.1/bin/ranlib: file: libclang_rt.cc_kext_x86_64_osx.a(trunctfsf2.c.o) has no symbols
[ 66%] Built target clang_rt.cc_kext_x86_64_osx
[ 66%] Built target RTfuzzer.osx
make: *** [Makefile:149: all] Error 2
builder for '/nix/store/s7d1y3nsvnazhwh85gfskp42wcr22k9n-compiler-rt-libc-12.0.0.drv' failed with exit code 2
cannot build derivation '/nix/store/52vnh7i8n3igfi2pgx1nk02zfx47mh3p-clang-wrapper-12.0.0.drv': 1 dependencies couldn't be built
error: build of '/nix/store/52vnh7i8n3igfi2pgx1nk02zfx47mh3p-clang-wrapper-12.0.0.drv' failed

I have seen this happening on the nixpkgs PR too. Not sure how to deal with it, I have no time to investigate/fix right now.

@nomeata
Copy link
Collaborator Author

nomeata commented May 27, 2021

I am surprised you have to build that at all - isn't it part of our nix cache by now?

@crusso
Copy link
Contributor

crusso commented May 27, 2021

Testing it now...

(just by running nix-shell - lemme know if you want more).

@crusso
Copy link
Contributor

crusso commented May 27, 2021

Works for me!

default.nix Outdated Show resolved Hide resolved
default.nix Outdated Show resolved Hide resolved
Copy link
Contributor

@crusso crusso left a comment

Choose a reason for hiding this comment

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

Approved, but see suggestions for typos and issue filing

@nomeata nomeata added the automerge-squash When ready, merge (using squash) label May 28, 2021
@mergify mergify bot merged commit 10339df into master May 28, 2021
@mergify mergify bot removed the automerge-squash When ready, merge (using squash) label May 28, 2021
@nomeata nomeata deleted the joachim/nixpkgs-master branch June 3, 2021 13:44
nomeata added a commit that referenced this pull request Aug 25, 2021
in #2532 we added a patch related to static building of ocaml packages,
submitted to nixpkgs as NixOS/nixpkgs#124498,
but it was never merged upstream.

Supposedly a patch from NixOS/nixpkgs#135619
fixes it as well (and maybe more properly). So let’s try that!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants