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

Update nixpkgs to master from 2019-10-20 #61

Merged
merged 1 commit into from
Oct 27, 2019
Merged

Conversation

nh2
Copy link
Owner

@nh2 nh2 commented Oct 20, 2019

No description provided.

@nh2 nh2 force-pushed the nixpkgs-master-2019-10-20 branch from 3954d5b to f67d0a1 Compare October 20, 2019 02:43
@nh2
Copy link
Owner Author

nh2 commented Oct 20, 2019

Important change: NixOS/nixpkgs#61682 (comment)

@nh2
Copy link
Owner Author

nh2 commented Oct 21, 2019

Now I get the build errors from #56.

@nh2 nh2 force-pushed the nixpkgs-master-2019-10-20 branch 2 times, most recently from 77f5a60 to c8fcaf9 Compare October 21, 2019 01:26
@nh2
Copy link
Owner Author

nh2 commented Oct 21, 2019

Now I get the build errors from #56.

NixOS/nixpkgs#71480 fixes that.

Next problem:

https://buildkite.com/nh2/static-haskell-nix/builds/109#e544003f-8609-44af-80a5-b6e38d046b1b

configure: error: cannot execute: /nix/store/9dlxvh3z38bfz9zv0fcklrd53xdw4b36-x86_64-unknown-linux-musl-binutils-wrapper-2.31.1/bin/x86_64-unknown-linux-musl-as: check --with-as or env. var. DEFAULT_ASSEMBLER
...
make[1]: *** [Makefile:4188: configure-gcc] Error 1
...
builder for '/nix/store/hsc2n472r2il8zp9p31wcwn4mml7lgp5-gcc-debug-8.3.0-x86_64-unknown-linux-musl-stage-static.drv' failed with exit code 2
% ls -l /nix/store/9dlxvh3z38bfz9zv0fcklrd53xdw4b36-x86_64-unknown-linux-musl-binutils-wrapper-2.31.1/bin/
total 8
-r-xr-xr-x 1 niklas niklas 8065 Jan  1  1970 x86_64-unknown-linux-musl-ld*

The x86_64-unknown-linux-musl-as it's trying to execute does not exist.

@nh2
Copy link
Owner Author

nh2 commented Oct 21, 2019

The x86_64-unknown-linux-musl-as it's trying to execute does not exist.

Expanding the builder for the musl-binutils-wrapper, I can see:

      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 as:

% ls /nix/store/wpj60n3r8amjlkxxj7x4dzs6ksy8k4pf-x86_64-unknown-linux-musl-binutils-2.31.1/bin
addr2line*  ar*  as*  c++filt*  dwp*  elfedit*  gprof*  ld@  ld.bfd*  ld.gold*  nm*  objcopy*  objdump*  ranlib*  readelf*  size*  strings*  strip*

so the if is false.

Not sure yet why the x86_64-unknown-linux-musl-ld works.

@nh2
Copy link
Owner Author

nh2 commented Oct 22, 2019

Got some progress with https://buildkite.com/nh2/static-haskell-nix/builds/113:

The -A working set and stack2nix-example are building with 8.6.5, but the other things not yet.

@nh2 nh2 force-pushed the nixpkgs-master-2019-10-20 branch from 3b331e7 to 5a736a3 Compare October 25, 2019 18:07
@nh2
Copy link
Owner Author

nh2 commented Oct 26, 2019

-A workingStackageExecutables needs NixOS/nixpkgs#72019

@nh2
Copy link
Owner Author

nh2 commented Oct 26, 2019

I now discovered I need, via this dependency chain:

haskellPackages.H
  R
    openjdk-8u222
      cups-2.2.12
        systemd-243

these PRs that @cdepillabout made solve it:

I'll cherry-pick those.

I also need: NixOS/nixpkgs#72032

@nh2
Copy link
Owner Author

nh2 commented Oct 27, 2019

I also need: NixOS/nixpkgs#72032

Made improved PR NixOS/nixpkgs#72057 for better polkit support.

May not need it in the end for static-haskell-nix because I've disabled (for H) R's openjdk support; it came in via

haskellPackages.H
  R
    openjdk-8u222
      gconf
        polkit

The PR may nevertheless improve musl support for the future.

@nh2
Copy link
Owner Author

nh2 commented Oct 27, 2019

Another PR for R static libs: NixOS/nixpkgs#72058

@nh2 nh2 force-pushed the nixpkgs-master-2019-10-20 branch from 3ee9dc5 to 887fed1 Compare October 27, 2019 01:42
@nh2
Copy link
Owner Author

nh2 commented Oct 27, 2019

I found that before this master update, I didn't encounter H's dependency problems like R and openjdk, because H didn't evaluate even, because openjdk has assert stdenv.hostPlatform.libc == "glibc";` in

https://github.com/NixOS/nixpkgs/blob/4c0afa17702c32f40c70482bd16e47b37b30214e/pkgs/development/compilers/openjdk/bootstrap.nix#L7

that was triggered; apparently now it no longer is when evaluating haskellPackages.H.

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
@nh2 nh2 force-pushed the nixpkgs-master-2019-10-20 branch from 7d7290b to 1aa07a3 Compare October 27, 2019 13:18
@nh2
Copy link
Owner Author

nh2 commented Oct 27, 2019

I have squashed.

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.

1 participant