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

Jump to bottom

glibc: use local copy of patch to fix w/musl #39442

Merged
merged 1 commit into from Apr 24, 2018
Merged

glibc: use local copy of patch to fix w/musl #39442

merged 1 commit into from Apr 24, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Apr 24, 2018

fetchpatch doesn't work with bootstrap fetchurl,
so just use local file like we do for other glibc patches.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@dtzWill
glibc: use local copy of patch to fix w/musl
c3ab285 
fetchpatch doesn't work with bootstrap fetchurl,
so just use local file like we do for other glibc patches.
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: glibc

Partial log (click to expand)

Cannot nix-instantiate `glibc' because:
�[31;1merror:�[0m while evaluating 'callPackageWith' at �[1m/private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix�[0m:113:35, called from �[1m/private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/top-level/all-packages.nix�[0m:9009:11:
while evaluating 'makeOverridable' at �[1m/private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix�[0m:72:24, called from �[1m/private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix�[0m:117:8:
while evaluating anonymous function at �[1m/private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/development/libraries/glibc/default.nix�[0m:1:1, called from �[1m/private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/lib/customisation.nix�[0m:74:12:
assertion failed at �[1m/private/var/lib/ofborg/builds/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/development/libraries/glibc/default.nix�[0m:8:1

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: glibc

Partial log (click to expand)

/nix/store/ywp538wr551ary8nh3kijx72fvnmg07h-glibc-2.27

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: glibc

Partial log (click to expand)

/nix/store/27x7pinqdsl9f3rpbm8bsszd9fhwq266-glibc-2.27

@dtzWill dtzWill merged commit dfcae92 into NixOS:master Apr 24, 2018
@dtzWill dtzWill deleted the fix/glibc-no-fetchpatch branch April 24, 2018 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@dtzWill @GrahamcOfBorg