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: 16ffc74a3239
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6f38c93e3c08
Choose a head ref
  • 6 commits
  • 6 files changed
  • 1 contributor

Commits on Jan 31, 2020

  1. stdenv: make darwin builds reproducable 

    Fixes #21629

Passing these extra linker flags removes both the semi-random uuid
included in most binaries as well as making the sdk version consistent
instead of based on the current os version.

    Load command 8
         cmd LC_UUID
     cmdsize 24
        uuid 70FAF921-5DC8-371C-B814-4F121FADFDF4

    Load command 9
          cmd LC_VERSION_MIN_MACOSX
      cmdsize 16
      version 10.12
          sdk 10.13

The -macosx_version_min flag isn't strictly necessary since that's
already handled by MACOSX_DEPLOYMENT_TARGET.
    @LnL7
    LnL7 committed Jan 31, 2020
    Copy the full SHA
    a826b49 View commit details
    Browse the repository at this point in the history

  2. stdenv: introduce appleSdkVersion and macosVersionMin

    @LnL7
    LnL7 committed Jan 31, 2020
    Copy the full SHA
    6567823 View commit details
    Browse the repository at this point in the history

  3. treewide: use stdenv.macosVersionMin

    @LnL7
    LnL7 committed Jan 31, 2020
    Copy the full SHA
    9b57984 View commit details
    Browse the repository at this point in the history

  4. cmake: remove CMAKE_OSX_DEPLOYMENT_TARGET overrides 

    We _do_ want minimum versions in our packages.
    @LnL7
    LnL7 committed Jan 31, 2020
    Copy the full SHA
    b984c22 View commit details
    Browse the repository at this point in the history

  5. cmake: move CMAKE_OSX_ARCHITECTURES out of the stdenv 

    This was initially introduced in 92188d9,
not clear how relevant this still is but i686 isn't supported anymore so
disable it explicitly.
    @LnL7
    LnL7 committed Jan 31, 2020
    Copy the full SHA
    68513e4 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #77632 from LnL7/darwin-macos-version-min 

    stdenv: make darwin builds reproducable
    @LnL7
    LnL7 committed Jan 31, 2020
    Copy the full SHA
    6f38c93 View commit details
    Browse the repository at this point in the history