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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c3116cdce215
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 199ffe40e6c7
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 20, 2021

  1. darwin.apple-sdk: drop appleSdkVersion 

    In fact no one is using appleSdkVersion, and stdenv is decoupled with sdk.
    @holymonson
    holymonson committed Jan 20, 2021
    Copy the full SHA
    2467f5e View commit details

  2. Merge pull request #110140 from holymonson/prepare-apple-sdk 

    darwin.apple-sdk: drop appleSdkVersion
    @SuperSandro2000
    SuperSandro2000 authored Jan 20, 2021
    Copy the full SHA
    199ffe4 View commit details
Showing with 3 additions and 10 deletions.
  1. +1 −6 pkgs/os-specific/darwin/apple-sdk/default.nix
  2. +2 −4 pkgs/stdenv/darwin/default.nix
7 changes: 1 addition & 6 deletions pkgs/os-specific/darwin/apple-sdk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
{ stdenv, fetchurl, xar, cpio, pkgs, python3, pbzx, lib, darwin-stubs, print-reexports }:

let version = "10.12"; in

# Ensure appleSdkVersion is up to date.
assert stdenv.isDarwin -> stdenv.appleSdkVersion == version;

let
# sadly needs to be exported because security_tool needs it
sdk = stdenv.mkDerivation rec {
pname = "MacOS_SDK";
inherit version;
version = "10.12";

# This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.12.merged-1.sucatalog, which we found by:
# 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version
6 changes: 2 additions & 4 deletions pkgs/stdenv/darwin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{ lib
, localSystem, crossSystem, config, overlays, crossOverlays ? []
# The version of darwin.apple_sdk used for sources provided by apple.
, appleSdkVersion ? "10.12"
# Minimum required macOS version, used both for compatibility as well as reproducability.
, macosVersionMin ? "10.12"
# Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
@@ -150,7 +148,7 @@ in rec {
__extraImpureHostDeps = commonImpureHostDeps;

extraAttrs = {
inherit macosVersionMin appleSdkVersion platform;
inherit macosVersionMin platform;
};
overrides = self: super: (overrides self super) // {
inherit ccNoLibcxx;
@@ -524,7 +522,7 @@ in rec {
extraAttrs = {
libc = pkgs.darwin.Libsystem;
shellPackage = pkgs.bash;
inherit macosVersionMin appleSdkVersion platform bootstrapTools;
inherit macosVersionMin platform bootstrapTools;
};

allowedRequisites = (with pkgs; [