Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 59c3c4d6869e
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f316ac45e5dd
Choose a head ref
  • 5 commits
  • 4 files changed
  • 1 contributor

Commits on Aug 23, 2018

  1. Libsystem: remove libsystem_network.dylib from reexport list 

    Fixes #42719

(cherry picked from commit 52b8b68)
    @LnL7
    LnL7 committed Aug 23, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c61bc6a View commit details

  2. stdenv-bootstrap-tools: update unpack to use $reexportedLibrariesFile 

    (cherry picked from commit 5024e4a)
    @LnL7
    LnL7 committed Aug 23, 2018
    Copy the full SHA
    a58e00a View commit details

  3. Libsystem: remove version symbols 

    These no longer exist on 10.14

Fixes #42719

(cherry picked from commit 54f901d)
    @LnL7
    LnL7 committed Aug 23, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    mrgrain Momo Kornher
    SSH Key Fingerprint: ofPj7x0gR7f06qjrpoigd8+i5DUfuCIY6OF1rH90+JI
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8b70b52 View commit details

  4. Merge pull request #45437 from LnL7/macos-10.14-backport 

    darwin: macOS 10.14 compatibility
    @LnL7
    LnL7 authored Aug 23, 2018
    Copy the full SHA
    f176956 View commit details

Commits on Aug 26, 2018

  1. Merge branch 'staging-18.03' into release-18.03

    @LnL7
    LnL7 committed Aug 26, 2018
    Copy the full SHA
    f316ac4 View commit details
4 changes: 2 additions & 2 deletions pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@

/usr/lib/system/libsystem_configuration.dylib
/usr/lib/system/libsystem_coreservices.dylib
# /usr/lib/system/libsystem_coretls.dylib # Removed in 10.13
# /usr/lib/system/libsystem_coretls.dylib # Removed in 10.13
/usr/lib/system/libsystem_dnssd.dylib
/usr/lib/system/libsystem_info.dylib

@@ -28,7 +28,7 @@

/usr/lib/system/libsystem_m.dylib
/usr/lib/system/libsystem_malloc.dylib
/usr/lib/system/libsystem_network.dylib
# /usr/lib/system/libsystem_network.dylib # Removed in 10.14
/usr/lib/system/libsystem_networkextension.dylib
/usr/lib/system/libsystem_notify.dylib
/usr/lib/system/libsystem_platform.dylib
2 changes: 0 additions & 2 deletions pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols
View file
Original file line number Diff line number Diff line change
@@ -51,8 +51,6 @@ ___bt_setcur
___bt_split
___bt_sync
___buf_free
___cVersionNumber
___cVersionString
___call_hash
___cleanup
___cmp_D2A
2 changes: 0 additions & 2 deletions pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols
View file
Original file line number Diff line number Diff line change
@@ -57,8 +57,6 @@ ___ioctl
___iopolicysys
___kdebug_trace
___kdebug_trace64
___kernelVersionNumber
___kernelVersionString
___kill
___lchown
___libkernel_init
5 changes: 4 additions & 1 deletion pkgs/stdenv/darwin/make-bootstrap-tools.nix
View file
Original file line number Diff line number Diff line change
@@ -178,6 +178,9 @@ in rec {
unpack = stdenv.mkDerivation (bootstrapFiles // {
name = "unpack";

reexportedLibrariesFile =
../../os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries;

# This is by necessity a near-duplicate of unpack-bootstrap-tools.sh. If we refer to it directly,
# we can't make any changes to it due to our testing stdenv depending on it. Think of this as the
# unpack-bootstrap-tools.sh for the next round of bootstrap tools.
@@ -209,7 +212,7 @@ in rec {
$out/lib/system/libsystem_kernel.dylib
# TODO: this logic basically duplicates similar logic in the Libsystem expression. Deduplicate them!
libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }')
libs=$(cat $reexportedLibrariesFile | grep -v '^#')
for i in $libs; do
if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then