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: ad250c18f7b8
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d97e5e111595
Choose a head ref
  • 18 commits
  • 16 files changed
  • 2 contributors

Commits on Oct 17, 2018

  1. lib/systems: add uname attrs

    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    0e0894c View commit details
    Browse the repository at this point in the history

  2. make-derivation: set CMAKE_SYSTEM_* when cross compiling 

    Uses uname data to find what to set these variables:

- CMAKE_SYSTEM_NAME
- CMAKE_SYSTEM_PROCESSOR
- CMAKE_SYSTEM_VERSION
- CMAKE_HOST_SYSTEM_NAME
- CMAKE_HOST_SYSTEM_PROCESSOR
- CMAKE_HOST_SYSTEM_VERSION
    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    b3041b4 View commit details
    Browse the repository at this point in the history

  3. boost: remove broken patch 

    the boost url is broken - remove for now
    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    0397453 View commit details
    Browse the repository at this point in the history

  4. treewide: don’t set CMAKE_SYSTEM_NAME

    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    51e5f8a View commit details
    Browse the repository at this point in the history

  5. systems/doubles.nix: add mingw doubles 

    this makes it easier to show what supports windows vs. unix.
    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    8652631 View commit details
    Browse the repository at this point in the history

  6. sqlite: supports windows

    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    b491710 View commit details
    Browse the repository at this point in the history

  7. boost: use correct platform 

    "platforms.all" could include any possible os (even a machine with no
OS at all!). We can’t possible hope to support all of that, so need to
be more specific.
    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    007faf0 View commit details
    Browse the repository at this point in the history

  8. treewide: preserve hashes 

    avoid mass rebuild from the last commits
    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    a5de0ca View commit details
    Browse the repository at this point in the history

  9. zlib: skip configure in windows 

    configure spits out an error when running on windows
    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    845a364 View commit details
    Browse the repository at this point in the history

  10. c-ares: disable shared, enable static 

    only static will build for me
    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    b7e17a2 View commit details
    Browse the repository at this point in the history

  11. nghttp2: make app optional 

    windows just needs the libraries & the app won’t build
    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    a7c8e30 View commit details
    Browse the repository at this point in the history

  12. curl: disable gss on windows

    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    c86495c View commit details
    Browse the repository at this point in the history

  13. boost: use correct c compiler for bootstrapping 

    we need a c compiler that runs on the build machine for boost to work
    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    e3de8a9 View commit details
    Browse the repository at this point in the history

  14. lib/systems: use lookup for uname.system 

    This is a little bit cleaner and avoids the if ... else if ... chain.
    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    45cc6e2 View commit details
    Browse the repository at this point in the history

  15. curl: build statically on windows

    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    1660098 View commit details
    Browse the repository at this point in the history

  16. Correctly set windows doubles 

    mingw is the toolchain name but it is actually run on a window kernel
    @matthewbauer
    matthewbauer committed Oct 17, 2018
    Copy the full SHA
    c804000 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2018

  1. tests/systems.nix: fix tests 

    these weren’t being run correctly
    @matthewbauer
    matthewbauer committed Oct 18, 2018
    Copy the full SHA
    4a12a93 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #48602 from matthewbauer/cmake-cross 

    Set CMAKE_SYSTEM_* for cross compiling
    @Ericson2314
    Ericson2314 committed Oct 18, 2018
    Copy the full SHA
    d97e5e1 View commit details
    Browse the repository at this point in the history