tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'staging-18.03' into release-18.03

Daiderd Jordan f316ac45 59c3c4d6

+6 -7
+2 -2
pkgs/os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries
··· 19 19 20 20 /usr/lib/system/libsystem_configuration.dylib 21 21 /usr/lib/system/libsystem_coreservices.dylib 22 - # /usr/lib/system/libsystem_coretls.dylib # Removed in 10.13 22 + # /usr/lib/system/libsystem_coretls.dylib # Removed in 10.13 23 23 /usr/lib/system/libsystem_dnssd.dylib 24 24 /usr/lib/system/libsystem_info.dylib 25 25 ··· 28 28 29 29 /usr/lib/system/libsystem_m.dylib 30 30 /usr/lib/system/libsystem_malloc.dylib 31 - /usr/lib/system/libsystem_network.dylib 31 + # /usr/lib/system/libsystem_network.dylib # Removed in 10.14 32 32 /usr/lib/system/libsystem_networkextension.dylib 33 33 /usr/lib/system/libsystem_notify.dylib 34 34 /usr/lib/system/libsystem_platform.dylib
-2
pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols
··· 51 51 ___bt_split 52 52 ___bt_sync 53 53 ___buf_free 54 - ___cVersionNumber 55 - ___cVersionString 56 54 ___call_hash 57 55 ___cleanup 58 56 ___cmp_D2A
-2
pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols
··· 57 57 ___iopolicysys 58 58 ___kdebug_trace 59 59 ___kdebug_trace64 60 - ___kernelVersionNumber 61 - ___kernelVersionString 62 60 ___kill 63 61 ___lchown 64 62 ___libkernel_init
+4 -1
pkgs/stdenv/darwin/make-bootstrap-tools.nix
··· 178 178 unpack = stdenv.mkDerivation (bootstrapFiles // { 179 179 name = "unpack"; 180 180 181 + reexportedLibrariesFile = 182 + ../../os-specific/darwin/apple-source-releases/Libsystem/reexported_libraries; 183 + 181 184 # This is by necessity a near-duplicate of unpack-bootstrap-tools.sh. If we refer to it directly, 182 185 # we can't make any changes to it due to our testing stdenv depending on it. Think of this as the 183 186 # unpack-bootstrap-tools.sh for the next round of bootstrap tools. ··· 212 209 $out/lib/system/libsystem_kernel.dylib 213 210 214 211 # TODO: this logic basically duplicates similar logic in the Libsystem expression. Deduplicate them! 215 - libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }') 212 + libs=$(cat $reexportedLibrariesFile | grep -v '^#') 216 213 217 214 for i in $libs; do 218 215 if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then