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: 32dfdb0b54dd
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5d755e916d56
Choose a head ref
  • 8 commits
  • 14 files changed
  • 4 contributors

Commits on Nov 10, 2019

  1. pythonPackages.qrcode: Fix "No module named pkg_resources" error

    (cherry picked from commit 7fee1c6)
    maralorn committed Nov 10, 2019
    Copy the full SHA
    0e7c0c7 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    f666c61 View commit details
    Browse the repository at this point in the history
  3. gcc: Deduplicate configureFlags

    Thanks again to @bgamari who in 1c12072
    did the cleanup to make this possible. It's been a long time coming!
    Ericson2314 committed Nov 10, 2019
    Copy the full SHA
    5c5ca01 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #73181 from Ericson2314/gcc-dedup-configure-flags-…

    …19.09
    
    gcc: Deduplicate `preConfigure` and `configureFlags`
    Ericson2314 committed Nov 10, 2019
    Copy the full SHA
    fecedd4 View commit details
    Browse the repository at this point in the history
  5. gcc: Fix cross after I accidentally changed build target

    I deleted "bootstrap", but forgot to make the condition
    build = host = target.
    Ericson2314 committed Nov 10, 2019
    Copy the full SHA
    3f74a4d View commit details
    Browse the repository at this point in the history
  6. Merge pull request #73185 from Ericson2314/gcc-fix-cross-whoops

    gcc: Fix cross after I accidentally changed build target for 19.09
    Ericson2314 committed Nov 10, 2019
    Copy the full SHA
    8ce730d View commit details
    Browse the repository at this point in the history
  7. Merge pull request #73160 from maralorn/fix-qrcode-backport

    pythonPackages.qrcode: Fix "No module named pkg_resources" error
    worldofpeace committed Nov 10, 2019
    Copy the full SHA
    688f9ef View commit details
    Browse the repository at this point in the history
  8. xcodeenv: bump default Xcode version to 11.1, default iOS SDK to 13.1…

    …. Add troubleshooting section to docs
    
    (cherry picked from commit 9b51c51)
    svanderburg committed Nov 10, 2019
    Copy the full SHA
    5d755e9 View commit details
    Browse the repository at this point in the history