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: b0dc7bc6a327
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 53449badb622
Choose a head ref
  • 7 commits
  • 0 files changed
  • 2 contributors

Commits on Dec 13, 2018

  1. stdenv: implement crossOverlays

    crossOverlays only apply to the packages being built, not the build
    packages. It is useful when you don’t care what is used to build your
    packages, just what is being built. The idea relies heavily on the
    cross compiling infrastructure. Using this implies that we need to
    create a cross stdenv.
    
    (cherry picked from commit a3a6ad7)
    matthewbauer authored and Ericson2314 committed Dec 13, 2018
    Copy the full SHA
    e842552 View commit details
    Browse the repository at this point in the history
  2. stdenv/adapters.nix: fixup makeStaticBinaries

    - makeStaticBinaries don’t work on Darwin (no stable ABI!)
    - Need to make sure NIX_CFLAGS_LINK appends
    - isStatic is not used anymore
    
    (cherry picked from commit 8726f6a)
    matthewbauer authored and Ericson2314 committed Dec 13, 2018
    Copy the full SHA
    7fcbc52 View commit details
    Browse the repository at this point in the history
  3. darwin/libiconv: fix static/shared logic

    The conditional was incorrect - postInstall script should only hsppen
    when enableShared = true.
    
    (cherry picked from commit 5e06294)
    matthewbauer authored and Ericson2314 committed Dec 13, 2018
    Copy the full SHA
    f11d534 View commit details
    Browse the repository at this point in the history
  4. zlib: clean up static/shared distincion

    This is kind of a mess, but basically:
    
    - static=true, shared=true means to build statically but move it to
      the static output
    - static=true, shared=false means to build statically and leave it in
      the main output
    - static=false, shared=true means to not build static at all
    
    Confusingly, the old default was static=true, shared=true even though
    static=false? Still can’t figure out what was meant by that.
    
    (cherry picked from commit e999def)
    matthewbauer authored and Ericson2314 committed Dec 13, 2018
    Copy the full SHA
    a8e0694 View commit details
    Browse the repository at this point in the history
  5. ncurses: make shared linking optinoal

    when enableShared = false, we set --without-shared flag.
    
    (cherry picked from commit 53a6789)
    matthewbauer authored and Ericson2314 committed Dec 13, 2018
    Copy the full SHA
    3170d61 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'crossOverlays-for-18.09' (early part) into tempory branch

    This was an early "pre-release" to stable, with a warning that the
    interface is not stable yet (thought we don't actually expect it to
    change).
    
    We do expect to make many static build fixes, however, which should go
    to master and staging, so we merge the cherry-picks back into master so
    we can do those fixes against:
    
      git merge-base upstream/master upstream/release-18.09
    
    and merge into both master and release-18.09. This is easier than
    cherry-picking when one knows in advance they are targeting multiple
    branches.
    
    No files should be changed with this merge.
    Ericson2314 committed Dec 13, 2018
    Copy the full SHA
    18e5cff View commit details
    Browse the repository at this point in the history
  7. Merge branch 'pkgsStatic-temp'

    No files are changed with this merge. See second parent commit for
    rational.
    Ericson2314 committed Dec 13, 2018
    Copy the full SHA
    53449ba View commit details
    Browse the repository at this point in the history