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: 470254a6da83
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 01429fc2ab40
Choose a head ref
  • 12 commits
  • 22 files changed
  • 1 contributor

Commits on Nov 11, 2019

  1. fetchurl: Eliminate pointless cross differences

    @Ericson2314
    Ericson2314 committed Nov 11, 2019
    Copy the full SHA
    38ebb8f View commit details
    Browse the repository at this point in the history

  2. lib: Switch to w64 vendor for MinGW 

    It is needed for the `-municode` flag, supposedly.
    @Ericson2314
    Ericson2314 committed Nov 11, 2019
    Copy the full SHA
    9171853 View commit details
    Browse the repository at this point in the history

  3. windows top-level: Clean up with makeScope

    @Ericson2314
    Ericson2314 committed Nov 11, 2019
    Copy the full SHA
    0a63190 View commit details
    Browse the repository at this point in the history

  4. mcfgthreads: Init from git

    @Ericson2314
    Ericson2314 committed Nov 11, 2019
    Copy the full SHA
    06c5e81 View commit details
    Browse the repository at this point in the history

  5. mingw-w64 libc: Multiple outputs and parallel builds 

    Also deduplicate more of the GCC derivations.
    @Ericson2314
    Ericson2314 committed Nov 11, 2019
    Copy the full SHA
    999ef20 View commit details
    Browse the repository at this point in the history

  6. gcc: Build MinGW stage two with threading library 

    Currently this is set up to be mcfgthreads, but it could be something
else instead.
    @Ericson2314
    Ericson2314 committed Nov 11, 2019
    Copy the full SHA
    04cb05d View commit details
    Browse the repository at this point in the history

  7. pcre: Skip winpthread dep 

    Seems to build just fine without it, maybe it was just using C++ threads
which mcfgthread provides?
    @Ericson2314
    Ericson2314 committed Nov 11, 2019
    Copy the full SHA
    89ec69e View commit details
    Browse the repository at this point in the history

  8. boehm-gc: Fix build on MinGW with mcfgthreads 

    CC @lhmouse
    @Ericson2314
    Ericson2314 committed Nov 11, 2019
    Copy the full SHA
    e00237e View commit details
    Browse the repository at this point in the history

  9. openssl: Switch deafult for MinGW 

    Working around broken build for now.
    @Ericson2314
    Ericson2314 committed Nov 11, 2019
    Copy the full SHA
    dec8d2c View commit details
    Browse the repository at this point in the history

  10. nghttp2: Fix MinGW build by skipping some optional deps 

    I think those deps could be made to build, but I didn't want to get
bogged down investigating further. "Use flags" are always a good thing,
so this is fine for now.
    @Ericson2314
    Ericson2314 committed Nov 11, 2019
    Copy the full SHA
    63eac67 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2019

  1. Merge remote-tracking branch 'upstream/master' into mingw-mcfthreads

    @Ericson2314
    Ericson2314 committed Nov 12, 2019
    Copy the full SHA
    16f0fe7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #73195 from Ericson2314/mingw-mcfthreads 

    MinGW: Enable C++ threads with mcfgthreads
    @Ericson2314
    Ericson2314 committed Nov 12, 2019
    Copy the full SHA
    01429fc View commit details
    Browse the repository at this point in the history