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

Commits on Jan 3, 2020

  1. xcode: Add more hashes, and fix some old ones

    @Ericson2314 @matthewbauer
    Ericson2314 authored and matthewbauer committed Jan 3, 2020
    Copy the full SHA
    28c3715 View commit details

  2. xcode: don’t use libstdc++ on iOS 

    Apple no longer ships with it, so best to avoid forcing it into use.
    @matthewbauer
    matthewbauer committed Jan 3, 2020
    Copy the full SHA
    3432b1b View commit details

  3. ghc: always use llvm with iOS 

    Even when building for the simulator.
    @matthewbauer
    matthewbauer committed Jan 3, 2020
    Copy the full SHA
    036cef9 View commit details

  4. Merge pull request #76070 from matthewbauer/ios-with-xcode-11-cherry-… 

    …pick-for-1909

iOS with xcode 11 cherry pick for 19.09
    @matthewbauer
    matthewbauer authored Jan 3, 2020
    Copy the full SHA
    2d94547 View commit details
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/8.4.4.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@

, libiconv ? null, ncurses

, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) || stdenv.targetPlatform.isiOS
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/8.6.5.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
, # GHC can be built with system libffi or a bundled one.
libffi ? null

, useLLVM ? !stdenv.targetPlatform.isx86
, useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/8.8.1.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
, # GHC can be built with system libffi or a bundled one.
libffi ? null

, useLLVM ? !stdenv.targetPlatform.isx86
, useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
2 changes: 1 addition & 1 deletion pkgs/development/compilers/ghc/head.nix
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@

, libiconv ? null, ncurses

, useLLVM ? !stdenv.targetPlatform.isx86
, useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
8 changes: 7 additions & 1 deletion pkgs/os-specific/darwin/xcode/default.nix
View file
Original file line number Diff line number Diff line change
@@ -45,7 +45,13 @@ in lib.makeExtensible (self: {
xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2";
xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic";
xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c";
xcode_9_4 = requireXcode "9.4" "132l92c702lm8yrc62w4b8n2iap1qzqvklqzi39x9832ajysn6vw";
xcode_9_3 = requireXcode "9.3" "12m9kb4759s2ky42b1vf7y38qqxn2j99s99adzc6ljnmy26ii12w";
xcode_9_4 = requireXcode "9.4" "00az1cf9pm8zmvzs6yq04prdmxp8xi3ymxw94jjh4mh7hlbkhcb7";
xcode_9_4_1 = requireXcode "9.4.1" "0y9kphj86c14jl6aibv57sd7ln0w06vdhzm8ysp0s98rfgyq2lbw";
xcode_10_1 = requireXcode "10.1" "1ssdbg4v8r11fjf4jl38pwyry2aia1qihbxyxapz0v0n5gfnp05v";
xcode_10_2 = requireXcode "10.2" "1xzybl1gvb3q5qwlwchanzpws4sb70i3plf0vrzvlfdp2hsb3pg7";
xcode_10_2_1 = requireXcode "10.2.1" "11sdb54nr0x7kp987qq839x6k5gdx7vqdxjiy5xm5279n1n47bmg";
xcode_10_3 = requireXcode "10.3" "1i628vfn6zad81fsz3zpc6z15chhskvyp8qnajp2wnpzvrwl6ngb";
xcode_11 = requireXcode "11" "1r03j3kkp4blfp2kqpn538w3dx57ms930fj8apjkq6dk7fv3jcqh";
xcode = self."xcode_${lib.replaceStrings ["."] ["_"] (if stdenv.targetPlatform.useiOSPrebuilt then stdenv.targetPlatform.xcodeVer else "8.2")}";
})
3 changes: 2 additions & 1 deletion pkgs/os-specific/darwin/xcode/sdk-pkgs.nix
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
, wrapCCWith
, buildIosSdk, targetIosSdkPkgs
, xcode
, lib
}:

let
@@ -48,7 +49,7 @@ rec {
tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp
mv cc-cflags.tmp $out/nix-support/cc-cflags
echo "-target ${targetPlatform.config} -arch ${iosPlatformArch targetPlatform}" >> $out/nix-support/cc-cflags
echo "-isystem ${sdk}/usr/include -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++" >> $out/nix-support/cc-cflags
echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags
'' + stdenv.lib.optionalString (sdk.platform == "iPhoneSimulator") ''
echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags
'' + stdenv.lib.optionalString (sdk.platform == "iPhoneOS") ''
8 changes: 6 additions & 2 deletions pkgs/top-level/darwin-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -68,8 +68,12 @@ in

usr-include = callPackage ../os-specific/darwin/usr-include { };

inherit (callPackages ../os-specific/darwin/xcode { } )
xcode_8_1 xcode_8_2 xcode_9_1 xcode_9_2 xcode_9_4 xcode;
inherit (callPackages ../os-specific/darwin/xcode { })
xcode_8_1 xcode_8_2
xcode_9_1 xcode_9_2 xcode_9_4 xcode_9_4_1
xcode_10_2 xcode_10_2_1 xcode_10_3
xcode_11
xcode;

CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { };