-
-
Notifications
You must be signed in to change notification settings - Fork 35
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
Update nixpkgs to master from 2019-10-20 #61
Conversation
3954d5b
to
f67d0a1
Compare
Important change: NixOS/nixpkgs#61682 (comment) |
f67d0a1
to
ea61d11
Compare
Now I get the build errors from #56. |
77f5a60
to
c8fcaf9
Compare
NixOS/nixpkgs#71480 fixes that. Next problem: https://buildkite.com/nh2/static-haskell-nix/builds/109#e544003f-8609-44af-80a5-b6e38d046b1b
The |
Expanding the builder for the ldPath="/nix/store/wpj60n3r8amjlkxxj7x4dzs6ksy8k4pf-x86_64-unknown-linux-musl-binutils-2.31.1/bin"
# Create a symlink to as (the assembler).
if [ -e $ldPath/x86_64-unknown-linux-musl-as ]; then
ln -s $ldPath/x86_64-unknown-linux-musl-as $out/bin/x86_64-unknown-linux-musl-as
fi But here the thing inside is called
so the Not sure yet why the |
Got some progress with https://buildkite.com/nh2/static-haskell-nix/builds/113: The |
3b331e7
to
5a736a3
Compare
|
I now discovered I need, via this dependency chain:
these PRs that @cdepillabout made solve it:
I'll cherry-pick those. I also need: NixOS/nixpkgs#72032 |
Made improved PR NixOS/nixpkgs#72057 for better May not need it in the end for static-haskell-nix because I've disabled (for
The PR may nevertheless improve musl support for the future. |
Another PR for |
3ee9dc5
to
887fed1
Compare
I found that before this master update, I didn't encounter that was triggered; apparently now it no longer is when evaluating |
Changes made to make CI green: * Temporarily disable cachix (it pulls in non-building deps) * survey: Don't try to patch cabal-3.0.0.0 (upstreamed patches) * Use zlib_both for building curl. Fixes that in latest nixpkgs master, the curl build sees the old, unoverridden zlib, even though we passed in an overridden one. https://buildkite.com/nh2/static-haskell-nix/builds/113#3551cfdf-fe73-4a75-a6dc-1cd3ae430860 * Fix fetchurl pulling in correct curl but incorrect zlib * nixpkgs: Update submodule for: postgresql: Fix 2 failing tests on musl * Add postgresql-orm pkgconfig override * Add pg-harness-server pkgconfig override * Add more test-looping packages * nixpkgs: Update submodule to fix polkit on musl * Disable Java support in R * Fixes for inline-r and H, but then giving up on H for now * static-stack: Use lts-12
7d7290b
to
1aa07a3
Compare
I have squashed. |
No description provided.