Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: b8102aa32e55
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 05fc2a35240d
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Mar 6, 2020

  1. stdenv: update ARM bootstrap tarballs 

    Fixes building glibc 2.30, which requires at least GCC 6.

Picked from the following cross-trunk evaluation:
https://hydra.nixos.org/eval/1568864 based on nixpkgs
commit ac241fb.

armv5tel job: https://hydra.nixos.org/build/111556418
armv6l job: https://hydra.nixos.org/build/111556521
armv7l job: https://hydra.nixos.org/build/111556551
    @lopsided98 @FRidh
    lopsided98 authored and FRidh committed Mar 6, 2020
    Copy the full SHA
    ee39e49 View commit details
    Browse the repository at this point in the history

  2. unpack-bootstrap-tools: remove obsolete linker script patching 

    The linker scripts no longer contain store paths, so this does nothing. More
importantly, libpthread.so is not longer a linker script on ARM, so the patching
would corrupt it.
    @lopsided98 @FRidh
    lopsided98 authored and FRidh committed Mar 6, 2020
    Copy the full SHA
    05fc2a3 View commit details
    Browse the repository at this point in the history