Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 5e425e22a750
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: ea863cd334be
Choose a head ref
  • 17 commits
  • 21 files changed
  • 8 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. top-level/stage.nix: add static overlay

    Adds the static overlay that can be used to build Nixpkgs statically.
    Can be used like:
    
      nix build pkgsStatic.hello
    
    Not all packages build, as some rely on dynamic linking.
    
    (cherry picked from commit 6d90a8b)
    matthewbauer authored and Ericson2314 committed Dec 13, 2018
    Copy the full SHA
    3c36dcc View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    3c1049f View commit details
    Browse the repository at this point in the history
  8. Fix english in stdenv.xml

    (cherry picked from commit d5c9319)
    guibou authored and Mic92 committed Dec 13, 2018
    Copy the full SHA
    fbfe10f View commit details
    Browse the repository at this point in the history
  9. nixos/sddm: Fix spelling of option in docs

    (cherry picked from commit c974813)
    etu authored and Mic92 committed Dec 13, 2018
    Copy the full SHA
    5c5607f View commit details
    Browse the repository at this point in the history
  10. nixos/lightdm: Fix spelling of option in docs

    (cherry picked from commit 6fa51fe)
    etu authored and Mic92 committed Dec 13, 2018
    Copy the full SHA
    7a37ddc View commit details
    Browse the repository at this point in the history
  11. Copy the full SHA
    62c6099 View commit details
    Browse the repository at this point in the history
  12. stdenv/darwin: fix portable libsystem hook

    Some packages don’t have /bin directories. We should only run
    install_name_tool if that directory exists.
    
    (cherry picked from commit 0b85745)
    matthewbauer authored and Ericson2314 committed Dec 13, 2018
    Copy the full SHA
    af2cebe View commit details
    Browse the repository at this point in the history
  13. Copy the full SHA
    91865b2 View commit details
    Browse the repository at this point in the history
  14. Copy the full SHA
    cb5a7bd View commit details
    Browse the repository at this point in the history
  15. Merge pull request #51969 from vaibhavsagar/fix-static-lz4

    lz4: Fix pkgsStatic build for 18.09
    Ericson2314 committed Dec 13, 2018
    Copy the full SHA
    340c0c4 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2018

  1. davfs2: 1.5.3 -> 1.5.4

    Semi-automatic update generated by
    https://github.com/ryantm/nixpkgs-update tools. This update was made
    based on information from
    https://repology.org/metapackage/davfs2/versions
    
    (cherry picked from commit c5f7204)
    r-ryantm authored and samueldr committed Dec 14, 2018
    Copy the full SHA
    d6d3a12 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    ea863cd View commit details
    Browse the repository at this point in the history