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: 867d387a1c92
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6aa5f2db8f4c
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 23, 2018

  1. Revert "Revert "Merge #42880: coreutils: 8.29 -> 8.30"" 

    This reverts commit e3ee9c0.
    @dtzWill
    dtzWill committed Sep 23, 2018
    Copy the full SHA
    095ef62 View commit details
    Browse the repository at this point in the history

  2. make-bootstrap-tools: fix with latest coreutils 

    Since gcc.lib/lib64 is a symlink to 'lib', the use of
"lib*/libgcc_s.so*" triggered a warning (error) with
the latest coreutils.  Essentially we were doing:

$ cp a/x b/x y/

And latest coreutils rejects such invocations.

Just copy from 'lib', lib64 is a link to it anyway.

* Nothing else in this file bothers looking at lib*
* AFAICT lib* only ever possibly matched lib64 anyway
    @dtzWill
    dtzWill committed Sep 23, 2018
    Copy the full SHA
    4d9f9f1 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2018

  1. Merge pull request #47245 from dtzWill/fix/coreutils-8.30-bootstrap 

    coreutils: try 8.30 again, fix bootstrap tools expression motivating revert before
    @xeji
    xeji committed Sep 25, 2018
    Copy the full SHA
    6aa5f2d View commit details
    Browse the repository at this point in the history