git.iko.soy/typeable/nixpkgs
on master help sign in
Merge staging-next into master
commita80982b4c9e5dc9a34973638d62b0c748bef4eec authorFrederik Rietdijk <fridh@fridh.nl> dateTue 7 May 2019, 19:29 (8 years ago) parent6ae8aed0196d8f
284 files changed+1675−3652
pkgs/applications/audio/fluidsynth/default.nix+3−3 pkgs/applications/editors/emacs/macport.nix+1−1 pkgs/applications/graphics/imgcat/default.nix+2 pkgs/applications/misc/tthsum/default.nix+2 pkgs/applications/networking/browsers/firefox/common.nix+1−7 pkgs/applications/networking/instant-messengers/spectral/default.nix+3−1 pkgs/applications/science/astronomy/xplanet/default.nix+2 pkgs/applications/science/biology/cmtk/default.nix+2 pkgs/build-support/setup-hooks/patch-shebangs.sh+54−6 pkgs/build-support/wrapper-common/utils.bash−3 pkgs/desktops/gnome-3/core/dconf/default.nix+1−1 pkgs/desktops/gnustep/default.nix+4−2 pkgs/development/compilers/gcc/4.8/default.nix+1 pkgs/development/compilers/gcc/4.9/default.nix+1 pkgs/development/compilers/gcc/5/default.nix+1 pkgs/development/compilers/go/1.10.nix+1−5 pkgs/development/compilers/go/1.11.nix+1−6 pkgs/development/compilers/go/1.12.nix+1−4 pkgs/development/compilers/ldc/default.nix+1−1 pkgs/development/compilers/llvm/3.7/libc++/default.nix+1 pkgs/development/compilers/llvm/3.9/llvm.nix+10−6 pkgs/development/compilers/llvm/4/lld.nix+1 pkgs/development/compilers/llvm/4/llvm.nix+10−6 pkgs/development/compilers/llvm/5/lld.nix+1 pkgs/development/compilers/llvm/5/llvm.nix+10−6 pkgs/development/compilers/llvm/6/llvm.nix+9−6 pkgs/development/compilers/llvm/7/clang/default.nix+1−1 pkgs/development/compilers/llvm/7/compiler-rt-clock_gettime.patch−74 pkgs/development/compilers/llvm/7/compiler-rt.nix+3−4 pkgs/development/compilers/llvm/7/default.nix+2−2 pkgs/development/compilers/llvm/7/libc++/default.nix+1−1 pkgs/development/compilers/llvm/7/libc++abi.nix+1−1 pkgs/development/compilers/llvm/7/lld.nix+1−1 pkgs/development/compilers/llvm/7/lldb.nix+1−1 pkgs/development/compilers/llvm/7/llvm.nix+9−13 pkgs/development/compilers/llvm/7/openmp.nix+1−1 pkgs/development/compilers/llvm/8/compiler-rt-clock_gettime.patch−74 pkgs/development/compilers/llvm/8/compiler-rt.nix+1−2 pkgs/development/compilers/rust/default.nix+9−2 pkgs/development/haskell-modules/configuration-nix.nix−19 pkgs/development/interpreters/guile/2.0.nix+8−1 pkgs/development/interpreters/guile/default.nix+6−2 pkgs/development/interpreters/guile/filter-mkostemp-darwin.patch+28 pkgs/development/interpreters/python/cpython/2.7/default.nix+1−1 pkgs/development/interpreters/python/cpython/default.nix+1−1 pkgs/development/interpreters/python/default.nix+2−1 pkgs/development/interpreters/python/pypy/default.nix+1 pkgs/development/interpreters/python/pypy/prebuilt.nix+1 pkgs/development/interpreters/python/setup-hook.sh+3−1 pkgs/development/interpreters/tcl/8.6.nix+2−2 pkgs/development/interpreters/tcl/generic.nix+3−2 pkgs/development/libraries/boost/1.67.nix+27−5 pkgs/development/libraries/boost/generic.nix+3−2 pkgs/development/libraries/bullet/default.nix+2 pkgs/development/libraries/clucene-core/2.x.nix+2 pkgs/development/libraries/glib/default.nix+2−2 pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch+29−21 pkgs/development/libraries/gobject-introspection/default.nix+2−3 pkgs/development/libraries/gobject-introspection/macos-shared-library.patch−36 pkgs/development/libraries/gobject-introspection/test_shlibs.patch+12−19 pkgs/development/libraries/libao/default.nix+1−1 pkgs/development/libraries/libcdio/default.nix+1−1 pkgs/development/libraries/libcroco/default.nix+3−16 pkgs/development/libraries/libdrm/default.nix−5 pkgs/development/libraries/libdrm/libdrm-apple.patch−88 pkgs/development/libraries/libproxy/default.nix+7−1 pkgs/development/libraries/libsnark/darwin-fix-clock-gettime.patch−41 pkgs/development/libraries/libsnark/default.nix−2 pkgs/development/libraries/libsoup/default.nix+2−2 pkgs/development/libraries/libtins/default.nix+5−1 pkgs/development/libraries/libuv/default.nix+2−2 pkgs/development/libraries/libva/default.nix+2−2 pkgs/development/libraries/libxslt/default.nix+9−1 pkgs/development/libraries/mesa/darwin-clock-gettime.patch−76 pkgs/development/libraries/mesa/default.nix+1−1 pkgs/development/libraries/polkit/default.nix+15−23 pkgs/development/libraries/qt-4.x/4.8/default.nix+1 pkgs/development/libraries/qt-5/5.11/default.nix+11−21 pkgs/development/libraries/qt-5/5.11/qtbase-darwin-nseventtype.patch−13 pkgs/development/libraries/qt-5/5.11/qtbase-darwin-revert-69221.patch−73 pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patch−70 pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patch−102 pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patch−30 pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patch−21 pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-sdk-10.10.patch−160 pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-qos-classes.patch−11 pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-readline.patch−45 pkgs/development/libraries/qt-5/5.12/default.nix+5−7 pkgs/development/libraries/qt-5/5.12/qtbase-darwin-nseventtype.patch−13 pkgs/development/libraries/qt-5/5.12/qtbase-darwin.patch−70 pkgs/development/libraries/qt-5/5.12/qtbase-revert-no-macos10.10.patch−102 pkgs/development/libraries/qt-5/5.9/default.nix+1−1 pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patch−35 pkgs/development/libraries/qt-5/modules/qtbase.nix+10−26 pkgs/development/libraries/qt-5/modules/qtwebengine.nix+1−1 pkgs/development/libraries/science/math/fenics/default.nix+7−2 pkgs/development/libraries/science/math/openblas/default.nix+1 pkgs/development/libraries/sqlite/analyzer.nix+3−3 pkgs/development/libraries/sqlite/default.nix+4−4 pkgs/development/libraries/tk/8.6.nix+2−2 pkgs/development/libraries/tk/generic.nix+7−4 pkgs/development/libraries/wxwidgets/2.9/default.nix+2−1 pkgs/development/libraries/wxwidgets/3.0/default.nix+1 pkgs/development/libraries/wxwidgets/3.0/mac.nix+1 pkgs/development/python-modules/Wand/default.nix+2−2 pkgs/development/python-modules/ansible-runner/default.nix+2−2 pkgs/development/python-modules/asyncssh/default.nix+28−8 pkgs/development/python-modules/asyncssh/fix-sftp-chmod-test-nixos.patch+15 pkgs/development/python-modules/atomman/default.nix+2−2 pkgs/development/python-modules/aws-sam-translator/default.nix−2 pkgs/development/python-modules/azure-common/default.nix+2−2 pkgs/development/python-modules/cffi/default.nix+3−3 pkgs/development/python-modules/cfn-lint/default.nix+40 pkgs/development/python-modules/cryptography/default.nix−8 pkgs/development/python-modules/cx_oracle/default.nix+2−2 pkgs/development/python-modules/cypari2/default.nix+2−2 pkgs/development/python-modules/django_silk/default.nix+2−2 pkgs/development/python-modules/ecdsa/default.nix+2−2 pkgs/development/python-modules/genanki/default.nix+2−2 pkgs/development/python-modules/gsd/default.nix+2−2 pkgs/development/python-modules/httplib2/default.nix+2−2 pkgs/development/python-modules/j2cli/default.nix+2−2 pkgs/development/python-modules/jdcal/default.nix+2−2 pkgs/development/python-modules/jinja2/default.nix−3 pkgs/development/python-modules/junos-eznc/default.nix+2−2 pkgs/development/python-modules/matplotlib/2.nix+1−1 pkgs/development/python-modules/matplotlib/darwin-stdenv-2.2.3.patch−10 pkgs/development/python-modules/matplotlib/darwin-stdenv.patch−12 pkgs/development/python-modules/matplotlib/default.nix+1−2 pkgs/development/python-modules/mecab-python3/default.nix+2−2 pkgs/development/python-modules/moto/default.nix+4−3 pkgs/development/python-modules/nameparser/default.nix+2−2 pkgs/development/python-modules/nilearn/default.nix+2−2 pkgs/development/python-modules/numpy/default.nix+3−3 pkgs/development/python-modules/objgraph/default.nix+2−2 pkgs/development/python-modules/paho-mqtt/default.nix+3−1 pkgs/development/python-modules/papis/default.nix+3 pkgs/development/python-modules/phonenumbers/default.nix+2−2 pkgs/development/python-modules/pyasn1-modules/default.nix+19−3 pkgs/development/python-modules/pycairo/default.nix+2−2 pkgs/development/python-modules/pygobject/3.nix+2−2 pkgs/development/python-modules/pyro-ppl/default.nix+2−2 pkgs/development/python-modules/pyrr/default.nix+2−2 pkgs/development/python-modules/pyspark/default.nix+2−2 pkgs/development/python-modules/pytest-mock/default.nix+2−2 pkgs/development/python-modules/ruamel_yaml/default.nix+2−2 pkgs/development/python-modules/s3fs/default.nix+2−2 pkgs/development/python-modules/setuptools/default.nix+2−2 pkgs/development/python-modules/smart_open/default.nix+2−2 pkgs/development/python-modules/sparqlwrapper/default.nix+2−2 pkgs/development/python-modules/sqlalchemy-migrate/default.nix+2 pkgs/development/python-modules/sseclient/default.nix+2−2 pkgs/development/python-modules/typed-ast/default.nix+2−2 pkgs/development/python-modules/urllib3/default.nix+2−2 pkgs/development/python-modules/xkcdpass/default.nix+2−2 pkgs/development/python-modules/xlib/default.nix+2 pkgs/development/python-modules/xml2rfc/default.nix+3 pkgs/development/python-modules/zope_testrunner/default.nix+2 pkgs/development/tools/analysis/valgrind/default.nix+5−14 pkgs/development/tools/build-managers/cmake/application-services.patch+6−6 pkgs/development/tools/build-managers/cmake/default.nix+1−2 pkgs/development/tools/build-managers/dub/default.nix+1−1 pkgs/development/tools/gnulib/default.nix+5−4 pkgs/stdenv/darwin/darwin-secure-format.patch → pkgs/development/tools/misc/gnum4/darwin-secure-format.patch pkgs/development/tools/misc/gnum4/default.nix+2−1 pkgs/development/tools/misc/tokei/default.nix+3−1 pkgs/development/tools/xcbuild/toolchains.nix+1 pkgs/development/tools/xcbuild/wrapper.nix+7−7 pkgs/development/web/nodejs/v12.nix+10 pkgs/games/gargoyle/darwin.patch−64 pkgs/games/gargoyle/default.nix−2 pkgs/games/quake2/yquake2/default.nix+2 pkgs/misc/jackaudio/darwin-cf.patch−49 pkgs/misc/jackaudio/default.nix+11−12 pkgs/os-specific/darwin/apple-sdk/default.nix+9−29 pkgs/os-specific/darwin/apple-sdk/frameworks.nix+10−10 pkgs/os-specific/darwin/apple-source-releases/Libc/CrashReporterClient.h+51 pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix+2 pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix+39−8 pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols+27 pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols+158 pkgs/os-specific/darwin/apple-source-releases/Security/boot.nix+116 pkgs/os-specific/darwin/apple-source-releases/Security/default.nix+11−108 pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nix−42 pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nix+91 pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix+31−72 pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix−59 pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix+1 pkgs/os-specific/darwin/apple-source-releases/default.nix+56−83 pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix+2−2 pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix+41−38 pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nix−47 pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix+2−2 pkgs/os-specific/darwin/apple-source-releases/hfs/default.nix+8 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/GNUmakefile−11 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nix−31 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_cspdl/GNUmakefile−10 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_cspdl/default.nix−16 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_file_dl/GNUmakefile−10 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_file_dl/default.nix−17 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/GNUmakefile−10 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nix−18 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefile−11 pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/default.nix−19 pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/GNUmakefile−11 pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nix−14 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_client/GNUmakefile−10 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_client/default.nix−8 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/GNUmakefile−10 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nix−15 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/GNUmakefile−13 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nix−13 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/handletemplates.patch−19 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/GNUmakefile−13 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nix−8 pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/GNUmakefile−10 pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nix−33 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/GNUmakefile−11 pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nix−14 pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/GNUmakefile−10 pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nix−13 pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nix−63 pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nix−128 pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/GNUmakefile−10 pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nix−43 pkgs/os-specific/darwin/apple-source-releases/libsecurity_mds/GNUmakefile−10 pkgs/os-specific/darwin/apple-source-releases/libsecurity_mds/default.nix−11 pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/GNUmakefile−10 pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nix−20 pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/GNUmakefile−11 pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nix−15 pkgs/os-specific/darwin/apple-source-releases/libsecurity_sd_cspdl/GNUmakefile−10 pkgs/os-specific/darwin/apple-source-releases/libsecurity_sd_cspdl/default.nix−10 pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/GNUmakefile−11 pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nix−28 pkgs/os-specific/darwin/apple-source-releases/libsecurityd/GNUmakefile−11 pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nix−23 pkgs/os-specific/darwin/apple-source-releases/libsecurityd/xdr-arity.patch−79 pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix+23−3 pkgs/os-specific/darwin/apple-source-releases/libutil/new.nix−29 pkgs/os-specific/darwin/apple-source-releases/security_dotmac_tp/GNUmakefile−8 pkgs/os-specific/darwin/apple-source-releases/security_dotmac_tp/default.nix−4 pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nix−32 pkgs/os-specific/darwin/apple-source-releases/top/default.nix+2−2 pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix+50−43 pkgs/os-specific/darwin/binutils/default.nix+1−1 pkgs/os-specific/darwin/cctools/apfs.patch+22 pkgs/os-specific/darwin/cctools/ld-tbd-v2.patch−98 pkgs/os-specific/darwin/cctools/port.nix+22−42 pkgs/os-specific/darwin/cctools/support-ios.patch−13 pkgs/os-specific/darwin/cctools/undo-unknown-triple.patch−17 pkgs/os-specific/darwin/cf-private/default.nix+1−4 pkgs/os-specific/darwin/darling/default.nix+3 pkgs/os-specific/darwin/libtapi/default.nix+29 pkgs/os-specific/darwin/osx-private-sdk/default.nix−27 pkgs/os-specific/darwin/security-tool/GNUmakefile−14 pkgs/os-specific/darwin/security-tool/default.nix−101 pkgs/stdenv/darwin/default.nix+26−25 pkgs/stdenv/darwin/make-bootstrap-tools.nix+4−4 pkgs/stdenv/generic/setup.sh+7−4 pkgs/tools/X11/xprintidle-ng/default.nix+19−9 pkgs/tools/archivers/gnutar/default.nix+1 pkgs/tools/archivers/p7zip/default.nix+2 pkgs/tools/compression/lz4/default.nix+2−2 pkgs/tools/compression/pbzip2/default.nix+2 pkgs/tools/filesystems/e2fsprogs/default.nix+3−1 pkgs/tools/filesystems/file-rename/default.nix+2 pkgs/tools/misc/toybox/default.nix+2 pkgs/tools/misc/zabbix-cli/default.nix+2−2 pkgs/tools/networking/network-manager/default.nix+9−5 pkgs/tools/networking/network-manager/fix-paths.patch+6−5 pkgs/tools/networking/ntopng/default.nix+2−1 pkgs/tools/package-management/nix/default.nix+5−2 pkgs/tools/security/opensc/default.nix+2 pkgs/tools/security/tcpcrypt/default.nix+3−3 pkgs/tools/text/gnupatch/CVE-2018-6952.patch+28 pkgs/tools/text/gnupatch/default.nix+2 pkgs/tools/text/platinum-searcher/default.nix−5 pkgs/tools/text/sgml/opensp/default.nix+12−8 pkgs/top-level/all-packages.nix+71−28 pkgs/top-level/darwin-packages.nix+5−9 pkgs/top-level/perl-packages.nix+3 pkgs/top-level/python-packages.nix+2 pkgs/top-level/release.nix−1
pkgs/applications/audio/fluidsynth/default.nix+3−3
@@ -32,11 +32,11 @@ stdenv.mkDerivation rec {
3232
3333 nativeBuildInputs = [ pkgconfig cmake ];
3434
35− buildInputs = [ glib libsndfile ]
36− ++ lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]
35+ buildInputs = [ glib libsndfile libpulseaudio libjack2 ]
36+ ++ lib.optionals stdenv.isLinux [ alsaLib ]
3737 ++ lib.optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreMIDI CoreServices ];
3838
39− cmakeFlags = lib.optional stdenv.isDarwin "-Denable-framework=off";
39+ cmakeFlags = [ "-Denable-framework=off" ];
4040
4141 meta = with lib; {
4242 description = "Real-time software synthesizer based on the SoundFont 2 specifications";
pkgs/applications/editors/emacs/macport.nix+1−1
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
6868 "--enable-mac-app=$$out/Applications"
6969 ];
7070
71− CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10";
71+ CFLAGS = "-O3";
7272 LDFLAGS = "-O3 -L${ncurses.out}/lib";
7373
7474 postInstall = ''
pkgs/applications/graphics/imgcat/default.nix+2
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
2222 sha256 = "0m83c33rzxvs0w214njql2c7q3fg06wnyijch3l2s88i7frl121f";
2323 };
2424
25+ NIX_CFLAGS_COMPILE = "-Wno-error";
26+
2527 meta = with stdenv.lib; {
2628 description = "It's like cat, but for images";
2729 homepage = https://github.com/eddieantonio/imgcat;
pkgs/applications/misc/tthsum/default.nix+2
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
1515 cp obj-unix/tthsum $out/bin
1616 '';
1717
18+ doCheck = !stdenv.isDarwin;
19+
1820 meta = with stdenv.lib; {
1921 description = "An md5sum-alike program that works with Tiger/THEX hashes";
2022 longDescription = ''
pkgs/applications/networking/browsers/firefox/common.nix+1−7
@@ -153,15 +153,9 @@ stdenv.mkDerivation rec {
153153 ]
154154 ++ lib.optionals (!isTorBrowserLike) [
155155 "-I${nss.dev}/include/nss"
156− ]
157− ++ lib.optional stdenv.isDarwin [
158− "-isystem ${llvmPackages.libcxx}/include/c++/v1"
159− "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10"
160156 ];
161157
162− postPatch = lib.optionalString stdenv.isDarwin ''
163− substituteInPlace js/src/jsmath.cpp --replace 'defined(HAVE___SINCOS)' 0
164− '' + lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) ''
158+ postPatch = lib.optionalString (lib.versionAtLeast ffversion "63.0" && !isTorBrowserLike) ''
165159 substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h'
166160 '';
167161
pkgs/applications/networking/instant-messengers/spectral/default.nix+3−1
@@ -5,6 +5,7 @@
55# Not mentioned but seems needed
66, qtgraphicaleffects
77, qtdeclarative
8+, qtmacextras
89}:
910
1011let
@@ -37,7 +38,8 @@ in stdenv.mkDerivation rec {
3738
3839 nativeBuildInputs = [ pkgconfig qmake makeWrapper ];
3940 buildInputs = [ qtbase qtquickcontrols2 qtmultimedia qtgraphicaleffects qtdeclarative ]
40− ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio;
41+ ++ stdenv.lib.optional stdenv.hostPlatform.isLinux libpulseaudio
42+ ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin qtmacextras;
4143
4244 meta = with stdenv.lib; {
4345 description = "A glossy client for Matrix, written in QtQuick Controls 2 and C++";
pkgs/applications/science/astronomy/xplanet/default.nix+2
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
1717 ./gcc6.patch
1818 ];
1919
20+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
21+
2022 meta = {
2123 description = "Renders an image of the earth or other planets into the X root window";
2224 homepage = http://xplanet.sourceforge.net;
pkgs/applications/science/biology/cmtk/default.nix+2
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
1111
1212 buildInputs = [cmake];
1313
14+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
15+
1416 meta = with stdenv.lib; {
1517 description = "Computational Morphometry Toolkit ";
1618 longDescription = ''A software toolkit for computational morphometry of
pkgs/build-support/setup-hooks/patch-shebangs.sh+54−6
@@ -5,10 +5,32 @@
55# rewritten to /nix/store/<hash>/bin/python. Interpreters that are
66# already in the store are left untouched.
77
8−fixupOutputHooks+=('if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi')
8+fixupOutputHooks+=(patchShebangsAuto)
9+
10+# Run patch shebangs on a directory.
11+# patchShebangs [--build | --host] directory
12+
13+# Flags:
14+# --build : Lookup commands available at build-time
15+# --host : Lookup commands available at runtime
16+
17+# Example use cases,
18+# $ patchShebangs --host /nix/store/...-hello-1.0/bin
19+# $ patchShebangs --build configure
920
1021patchShebangs() {
22+ local pathName
23+
24+ if [ "$1" = "--host" ]; then
25+ pathName=HOST_PATH
26+ shift
27+ elif [ "$1" = "--build" ]; then
28+ pathName=PATH
29+ shift
30+ fi
31+
1132 local dir="$1"
33+
1234 header "patching script interpreter paths in $dir"
1335 local f
1436 local oldPath
@@ -27,6 +49,14 @@ patchShebangs() {
2749 oldInterpreterLine=$(head -1 "$f" | tail -c+3)
2850 read -r oldPath arg0 args <<< "$oldInterpreterLine"
2951
52+ if [ -z "$pathName" ]; then
53+ if [ -n "$strictDeps" ] && [[ "$f" = "$NIX_STORE"* ]]; then
54+ pathName=HOST_PATH
55+ else
56+ pathName=PATH
57+ fi
58+ fi
59+
3060 if $(echo "$oldPath" | grep -q "/bin/env$"); then
3161 # Check for unsupported 'env' functionality:
3262 # - options: something starting with a '-'
@@ -35,14 +65,17 @@ patchShebangs() {
3565 echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)"
3666 exit 1
3767 fi
38− newPath="$(command -v "$arg0" || true)"
68+
69+ newPath="$(PATH="${!pathName}" command -v "$arg0" || true)"
3970 else
4071 if [ "$oldPath" = "" ]; then
4172 # If no interpreter is specified linux will use /bin/sh. Set
4273 # oldpath="/bin/sh" so that we get /nix/store/.../sh.
4374 oldPath="/bin/sh"
4475 fi
45− newPath="$(command -v "$(basename "$oldPath")" || true)"
76+
77+ newPath="$(PATH="${!pathName}" command -v "$(basename "$oldPath")" || true)"
78+
4679 args="$arg0 $args"
4780 fi
4881
@@ -55,13 +88,28 @@ patchShebangs() {
5588 # escape the escape chars so that sed doesn't interpret them
5689 escapedInterpreterLine=$(echo "$newInterpreterLine" | sed 's|\\|\\\\|g')
5790 # Preserve times, see: https://github.com/NixOS/nixpkgs/pull/33281
58− touch -r "$f" "$f.timestamp"
91+ timestamp=$(mktemp)
92+ touch -r "$f" "$timestamp"
5993 sed -i -e "1 s|.*|#\!$escapedInterpreterLine|" "$f"
60− touch -r "$f.timestamp" "$f"
61− rm "$f.timestamp"
94+ touch -r "$timestamp" "$f"
95+ rm "$timestamp"
6296 fi
6397 fi
6498 done < <(find "$dir" -type f -perm -0100 -print0)
6599
66100 stopNest
67101}
102+
103+patchShebangsAuto () {
104+ if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then
105+
106+ # Dev output will end up being run on the build platform. An
107+ # example case of this is sdl2-config. Otherwise, we can just
108+ # use the runtime path (--host).
109+ if [ "$output" != out ] && [ "$output" = "$outputDev" ]; then
110+ patchShebangs --build "$prefix"
111+ else
112+ patchShebangs --host "$prefix"
113+ fi
114+ fi
115+}
pkgs/build-support/wrapper-common/utils.bash−3
@@ -86,9 +86,6 @@ expandResponseParams() {
8686 #shellcheck disable=SC2034
8787 readarray -d '' params < <("@expandResponseParams@" "$@")
8888 return 0
89− else
90− echo "Response files aren't supported during bootstrapping" >&2
91− return 1
9289 fi
9390 fi
9491 done
pkgs/desktops/gnome-3/core/dconf/default.nix+1−1
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 "-Dgtk_doc=true"
3939 ];
4040
41− doCheck = !stdenv.isAarch64;
41+ doCheck = !stdenv.isAarch64 && !stdenv.isDarwin;
4242
4343 passthru = {
4444 updateScript = gnome3.updateScript {
pkgs/desktops/gnustep/default.nix+4−2
@@ -1,4 +1,4 @@
1−{ pkgs, newScope }:
1+{ pkgs, newScope, stdenv, llvmPackages_6 }:
22
33let
44 callPackage = newScope self;
@@ -10,7 +10,9 @@ let
1010 gorm = callPackage ./gorm {};
1111 projectcenter = callPackage ./projectcenter {};
1212 system_preferences = callPackage ./systempreferences {};
13− libobjc = callPackage ./libobjc2 {};
13+ libobjc = callPackage ./libobjc2 {
14+ stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
15+ };
1416 make = callPackage ./make {};
1517 back = callPackage ./back {};
1618 base = callPackage ./base { giflib = pkgs.giflib_4_1; };
pkgs/development/compilers/gcc/4.8/default.nix+1
@@ -418,6 +418,7 @@ stdenv.mkDerivation ({
418418 stdenv.lib.platforms.freebsd ++
419419 stdenv.lib.platforms.illumos ++
420420 stdenv.lib.platforms.darwin;
421+ badPlatforms = [ "x86_64-darwin" ];
421422 };
422423}
423424
pkgs/development/compilers/gcc/4.9/default.nix+1
@@ -430,6 +430,7 @@ stdenv.mkDerivation ({
430430 stdenv.lib.platforms.freebsd ++
431431 stdenv.lib.platforms.illumos ++
432432 stdenv.lib.platforms.darwin;
433+ badPlatforms = [ "x86_64-darwin" ];
433434 };
434435}
435436
pkgs/development/compilers/gcc/5/default.nix+1
@@ -435,6 +435,7 @@ stdenv.mkDerivation ({
435435 stdenv.lib.platforms.freebsd ++
436436 stdenv.lib.platforms.illumos ++
437437 stdenv.lib.platforms.darwin;
438+ badPlatforms = [ "x86_64-darwin" ];
438439 };
439440}
440441
pkgs/development/compilers/go/1.10.nix+1−5
@@ -131,11 +131,6 @@ stdenv.mkDerivation rec {
131131 })
132132 ];
133133
134− postPatch = optionalString stdenv.isDarwin ''
135− echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"
136− substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil
137− '';
138−
139134 GOOS = if stdenv.isDarwin then "darwin" else "linux";
140135 GOARCH = if stdenv.isDarwin then "amd64"
141136 else if stdenv.hostPlatform.system == "i686-linux" then "386"
@@ -187,5 +182,6 @@ stdenv.mkDerivation rec {
187182 license = licenses.bsd3;
188183 maintainers = with maintainers; [ cstrahan orivej velovix mic92 ];
189184 platforms = platforms.linux ++ platforms.darwin;
185+ badPlatforms = [ "x86_64-darwin" ];
190186 };
191187}
pkgs/development/compilers/go/1.11.nix+1−6
@@ -136,11 +136,6 @@ stdenv.mkDerivation rec {
136136 ./skip-test-extra-files-on-386.patch
137137 ];
138138
139− postPatch = optionalString stdenv.isDarwin ''
140− echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"
141− substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil
142− '';
143−
144139 GOOS = stdenv.targetPlatform.parsed.kernel.name;
145140 GOARCH = goarch stdenv.targetPlatform;
146141 # GOHOSTOS/GOHOSTARCH must match the building system, not the host system.
@@ -188,7 +183,7 @@ stdenv.mkDerivation rec {
188183 (cd src && ./make.bash)
189184 '';
190185
191− doCheck = stdenv.hostPlatform == stdenv.targetPlatform;
186+ doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin;
192187
193188 checkPhase = ''
194189 runHook preCheck
pkgs/development/compilers/go/1.12.nix+1−4
@@ -141,9 +141,6 @@ stdenv.mkDerivation rec {
141141
142142 postPatch = ''
143143 find . -name '*.orig' -exec rm {} ';'
144− '' + optionalString stdenv.isDarwin ''
145− echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"
146− substituteInPlace "src/cmd/link/internal/ld/lib.go" --replace dsymutil ${llvm}/bin/llvm-dsymutil
147144 '';
148145
149146 GOOS = stdenv.targetPlatform.parsed.kernel.name;
@@ -193,7 +190,7 @@ stdenv.mkDerivation rec {
193190 (cd src && ./make.bash)
194191 '';
195192
196− doCheck = stdenv.hostPlatform == stdenv.targetPlatform;
193+ doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin;
197194
198195 checkPhase = ''
199196 runHook preCheck
pkgs/development/compilers/ldc/default.nix+1−1
@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
150150 else
151151 "";
152152
153− doCheck = !bootstrapVersion;
153+ doCheck = !bootstrapVersion && !stdenv.isDarwin;
154154
155155 checkPhase = stdenv.lib.optionalString doCheck ''
156156 # Build default lib test runners
pkgs/development/compilers/llvm/3.7/libc++/default.nix+1
@@ -43,5 +43,6 @@ stdenv.mkDerivation rec {
4343 description = "A new implementation of the C++ standard library, targeting C++11";
4444 license = with stdenv.lib.licenses; [ ncsa mit ];
4545 platforms = stdenv.lib.platforms.unix;
46+ badPlatforms = [ "x86_64-darwin" ];
4647 };
4748}
pkgs/development/compilers/llvm/3.9/llvm.nix+10−6
@@ -22,10 +22,13 @@ assert (stdenv.hostPlatform != stdenv.buildPlatform) -> !enableSharedLibraries;
2222let
2323 src = fetch "llvm" "1vi9sf7rx1q04wj479rsvxayb6z740iaz3qniwp266fgp5a07n8z";
2424
25− # Used when creating a version-suffixed symlink of libLLVM.dylib
26− shortVersion = with stdenv.lib;
27− concatStringsSep "." (take 2 (splitString "." version));
28−in stdenv.mkDerivation rec {
25+ # Used when creating a versioned symlinks of libLLVM.dylib
26+ versionSuffixes = with stdenv.lib;
27+ let parts = splitString "." version; in
28+ imap (i: _: concatStringsSep "." (take i parts)) parts;
29+in
30+
31+stdenv.mkDerivation {
2932 name = "llvm-${version}";
3033
3134 unpackPhase = ''
@@ -153,8 +156,9 @@ in stdenv.mkDerivation rec {
153156 + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
154157 substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \
155158 --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
156− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
157− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${version}.dylib
159+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
160+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
161+ '') versionSuffixes}
158162 '';
159163
160164 enableParallelBuilding = true;
pkgs/development/compilers/llvm/4/lld.nix+1
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
2727 homepage = http://lld.llvm.org/;
2828 license = stdenv.lib.licenses.ncsa;
2929 platforms = stdenv.lib.platforms.all;
30+ badPlatforms = [ "x86_64-darwin" ];
3031 };
3132}
pkgs/development/compilers/llvm/4/llvm.nix+10−6
@@ -19,10 +19,13 @@
1919let
2020 src = fetch "llvm" "0l9bf7kdwhlj0kq1hawpyxhna1062z3h7qcz2y8nfl9dz2qksy6s";
2121
22− # Used when creating a version-suffixed symlink of libLLVM.dylib
23− shortVersion = with stdenv.lib;
24− concatStringsSep "." (take 2 (splitString "." release_version));
25−in stdenv.mkDerivation (rec {
22+ # Used when creating a versioned symlinks of libLLVM.dylib
23+ versionSuffixes = with stdenv.lib;
24+ let parts = splitString "." release_version; in
25+ imap (i: _: concatStringsSep "." (take i parts)) parts;
26+in
27+
28+stdenv.mkDerivation (rec {
2629 name = "llvm-${version}";
2730
2831 unpackPhase = ''
@@ -136,8 +139,9 @@ in stdenv.mkDerivation (rec {
136139 + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) ''
137140 substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
138141 --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
139− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
140− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
142+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
143+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
144+ '') versionSuffixes}
141145 '';
142146
143147 doCheck = stdenv.isLinux && (!stdenv.isi686);
pkgs/development/compilers/llvm/5/lld.nix+1
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
2727 homepage = http://lld.llvm.org/;
2828 license = stdenv.lib.licenses.ncsa;
2929 platforms = stdenv.lib.platforms.all;
30+ badPlatforms = [ "x86_64-darwin" ];
3031 };
3132}
pkgs/development/compilers/llvm/5/llvm.nix+10−6
@@ -18,10 +18,13 @@
1818let
1919 src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm";
2020
21− # Used when creating a version-suffixed symlink of libLLVM.dylib
22− shortVersion = with stdenv.lib;
23− concatStringsSep "." (take 2 (splitString "." release_version));
24−in stdenv.mkDerivation (rec {
21+ # Used when creating a versioned symlinks of libLLVM.dylib
22+ versionSuffixes = with stdenv.lib;
23+ let parts = splitString "." release_version; in
24+ imap (i: _: concatStringsSep "." (take i parts)) parts;
25+in
26+
27+stdenv.mkDerivation (rec {
2528 name = "llvm-${version}";
2629
2730 unpackPhase = ''
@@ -119,8 +122,9 @@ in stdenv.mkDerivation (rec {
119122 substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
120123 --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" \
121124 --replace "\''${_IMPORT_PREFIX}/lib/libLTO.dylib" "$lib/lib/libLTO.dylib"
122− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
123− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
125+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
126+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
127+ '') versionSuffixes}
124128 '';
125129
126130 doCheck = stdenv.isLinux && (!stdenv.isi686);
pkgs/development/compilers/llvm/6/llvm.nix+9−6
@@ -21,11 +21,13 @@ let
2121
2222 src = fetch "llvm" "1qpls3vk85lydi5b4axl0809fv932qgsqgdgrk098567z4jc7mmn";
2323
24− # Used when creating a version-suffixed symlink of libLLVM.dylib
25− shortVersion = with stdenv.lib;
26− concatStringsSep "." (take 2 (splitString "." release_version));
24+ # Used when creating a versioned symlinks of libLLVM.dylib
25+ versionSuffixes = with stdenv.lib;
26+ let parts = splitString "." release_version; in
27+ imap (i: _: concatStringsSep "." (take i parts)) parts;
28+in
2729
28−in stdenv.mkDerivation (rec {
30+stdenv.mkDerivation (rec {
2931 name = "llvm-${version}";
3032
3133 unpackPhase = ''
@@ -133,8 +135,9 @@ in stdenv.mkDerivation (rec {
133135 + optionalString (stdenv.isDarwin && enableSharedLibraries) ''
134136 substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
135137 --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
136− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
137− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
138+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
139+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
140+ '') versionSuffixes}
138141 '';
139142
140143 doCheck = stdenv.isLinux && (!stdenv.isi686);
pkgs/development/compilers/llvm/7/clang/default.nix+1−1
@@ -9,7 +9,7 @@ let
99 name = "clang-${version}";
1010
1111 unpackPhase = ''
12− unpackFile ${fetch "cfe" "067lwggnbg0w1dfrps790r5l6k8n5zwhlsw7zb6zvmfpwpfn4nx4"}
12+ unpackFile ${fetch "cfe" "0vc4i87qwxnw9lci4ayws9spakg0z6w5w670snj9f8g5m9rc8zg9"}
1313 mv cfe-${version}* clang
1414 sourceRoot=$PWD/clang
1515 unpackFile ${clang-tools-extra_src}
pkgs/development/compilers/llvm/7/compiler-rt-clock_gettime.patchdeleted−74
@@ -1,74 +0,0 @@
1−commit f00c7bccf7955b7dfbb4859fd9019e9eb3349f2d
2−Author: Tobias Mayer <tobim@fastmail.fm>
3−Date: Wed Feb 13 12:44:17 2019 +0100
4−
5− Provide clock_gettime for xray on macos < 10.12
6−
7−diff --git a/lib/xray/xray_basic_logging.cc b/lib/xray/xray_basic_logging.cc
8−index a46c151af..38aea6932 100644
9−--- a/lib/xray/xray_basic_logging.cc
10−+++ b/lib/xray/xray_basic_logging.cc
11−@@ -36,6 +36,29 @@
12− #include "xray_tsc.h"
13− #include "xray_utils.h"
14−
15−+#if __MACH__
16−+#include <mach/clock.h>
17−+#include <mach/mach.h>
18−+enum clockid_t {
19−+ CLOCK_MONOTONIC = REALTIME_CLOCK,
20−+ CLOCK_REALTIME = REALTIME_CLOCK
21−+};
22−+
23−+int clock_gettime(clockid_t clock_id, struct timespec *ts) {
24−+ if (ts != NULL) {
25−+ clock_serv_t cclock;
26−+ mach_timespec_t mts;
27−+ host_get_clock_service(mach_host_self(), clock_id, &cclock);
28−+ clock_get_time(cclock, &mts);
29−+ mach_port_deallocate(mach_task_self(), cclock);
30−+ ts->tv_sec = mts.tv_sec;
31−+ ts->tv_nsec = mts.tv_nsec;
32−+ return 0;
33−+ }
34−+ return -1;
35−+}
36−+#endif
37−+
38− namespace __xray {
39−
40− SpinMutex LogMutex;
41−diff --git a/lib/xray/xray_fdr_logging.cc b/lib/xray/xray_fdr_logging.cc
42−index 4b308b27f..1d044c8fd 100644
43−--- a/lib/xray/xray_fdr_logging.cc
44−+++ b/lib/xray/xray_fdr_logging.cc
45−@@ -38,6 +38,29 @@
46− #include "xray_tsc.h"
47− #include "xray_utils.h"
48−
49−+#if __MACH__
50−+#include <mach/clock.h>
51−+#include <mach/mach.h>
52−+enum clockid_t {
53−+ CLOCK_MONOTONIC = REALTIME_CLOCK,
54−+ CLOCK_REALTIME = REALTIME_CLOCK
55−+};
56−+
57−+int clock_gettime(clockid_t clock_id, struct timespec *ts) {
58−+ if (ts != NULL) {
59−+ clock_serv_t cclock;
60−+ mach_timespec_t mts;
61−+ host_get_clock_service(mach_host_self(), clock_id, &cclock);
62−+ clock_get_time(cclock, &mts);
63−+ mach_port_deallocate(mach_task_self(), cclock);
64−+ ts->tv_sec = mts.tv_sec;
65−+ ts->tv_nsec = mts.tv_nsec;
66−+ return 0;
67−+ }
68−+ return -1;
69−+}
70−+#endif
71−+
72− namespace __xray {
73−
74− atomic_sint32_t LoggingStatus = {XRayLogInitStatus::XRAY_LOG_UNINITIALIZED};
pkgs/development/compilers/llvm/7/compiler-rt.nix+3−4
@@ -2,7 +2,7 @@
22stdenv.mkDerivation rec {
33 name = "compiler-rt-${version}";
44 inherit version;
5− src = fetch "compiler-rt" "065ybd8fsc4h2hikbdyricj6pyv4r7r7kpcikhb2y5zf370xybkq";
5+ src = fetch "compiler-rt" "1n48p8gjarihkws0i2bay5w9bdwyxyxxbpwyng7ba58jb30dlyq5";
66
77 nativeBuildInputs = [ cmake python llvm ];
88 buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi;
@@ -26,9 +26,8 @@ stdenv.mkDerivation rec {
2626
2727 patches = [
2828 ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
29− ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
30− ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch
31− ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin ./compiler-rt-clock_gettime.patch;
29+ ] ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch
30+ ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch;
3231
3332 # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
3433 # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
pkgs/development/compilers/llvm/7/default.nix+2−2
@@ -5,7 +5,7 @@
55}:
66
77let
8− release_version = "7.0.1";
8+ release_version = "7.1.0";
99 version = release_version; # differentiating these is important for rc's
1010
1111 fetch = name: sha256: fetchurl {
@@ -13,7 +13,7 @@ let
1313 inherit sha256;
1414 };
1515
16− clang-tools-extra_src = fetch "clang-tools-extra" "1v9vc7id1761qm7mywlknsp810232iwyz8rd4y5km4h7pg9cg4sc";
16+ clang-tools-extra_src = fetch "clang-tools-extra" "0lb4kdh7j2fhfz8kd6iv5df7m3pikiryk1vvwsf87spc90n09q0w";
1717
1818 tools = stdenv.lib.makeExtensible (tools: let
1919 callPackage = newScope (tools // { inherit stdenv cmake libxml2 python isl release_version version fetch; });
pkgs/development/compilers/llvm/7/libc++/default.nix+1−1
@@ -3,7 +3,7 @@
33stdenv.mkDerivation rec {
44 name = "libc++-${version}";
55
6− src = fetch "libcxx" "1wdrxg365ig0kngx52pd0n820sncp24blb0zpalc579iidhh4002";
6+ src = fetch "libcxx" "0kmhcapm2cjwalyiqasj9dmqbw59mcwdl8fgl951wg7ax84b8hj4";
77
88 postUnpack = ''
99 unpackFile ${libcxxabi.src}
pkgs/development/compilers/llvm/7/libc++abi.nix+1−1
@@ -3,7 +3,7 @@
33stdenv.mkDerivation {
44 name = "libc++abi-${version}";
55
6− src = fetch "libcxxabi" "1n6yx0949l9bprh75dffchahn8wplkm79ffk4f2ap9vw2lx90s41";
6+ src = fetch "libcxxabi" "1zcqxsdjhawgz1cvpk07y3jl6fg9p3ay4nl69zsirqb2ghgyhhb2";
77
88 nativeBuildInputs = [ cmake ];
99 buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
pkgs/development/compilers/llvm/7/lld.nix+1−1
@@ -9,7 +9,7 @@
99stdenv.mkDerivation {
1010 name = "lld-${version}";
1111
12− src = fetch "lld" "0ca0qygrk87lhjk6cpv1wbmdfnficqqjsda3k7b013idvnralsc8";
12+ src = fetch "lld" "0rsqb7zcnij5r5ipfhr129j7skr5n9pyr388kjpqwh091952f3x1";
1313
1414 nativeBuildInputs = [ cmake ];
1515 buildInputs = [ llvm libxml2 ];
pkgs/development/compilers/llvm/7/lldb.nix+1−1
@@ -17,7 +17,7 @@
1717stdenv.mkDerivation {
1818 name = "lldb-${version}";
1919
20− src = fetch "lldb" "10k9lyk3i72j9hca523r9pz79qp7d8q7jqnjy0i3saj1bgknpd3n";
20+ src = fetch "lldb" "0klsscg1sczc4nw2l53xggi969k361cng2sjjrfp3bv4g5x14s4v";
2121
2222 postPatch = ''
2323 # Fix up various paths that assume llvm and clang are installed in the same place
pkgs/development/compilers/llvm/7/llvm.nix+9−13
@@ -22,12 +22,13 @@
2222let
2323 inherit (stdenv.lib) optional optionals optionalString;
2424
25− src = fetch "llvm" "16s196wqzdw4pmri15hadzqgdi926zln3an2viwyq0kini6zr3d3";
26− polly_src = fetch "polly" "0wgvayfilgb530bq51l7szxfb13l24nnrmyji2f6ncq95a24dw8v";
25+ src = fetch "llvm" "0r1p5didv4rkgxyvbkyz671xddg6i3dxvbpsi1xxipkla0l9pk0v";
26+ polly_src = fetch "polly" "16qkns4ab4x0azrvhy4j7cncbyb2rrbdrqj87zphvqxm5pvm8m1h";
2727
28− # Used when creating a version-suffixed symlink of libLLVM.dylib
29− shortVersion = with stdenv.lib;
30− concatStringsSep "." (take 1 (splitString "." release_version));
28+ # Used when creating a versioned symlinks of libLLVM.dylib
29+ versionSuffixes = with stdenv.lib;
30+ let parts = splitString "." release_version; in
31+ imap (i: _: concatStringsSep "." (take i parts)) parts;
3132
3233in stdenv.mkDerivation (rec {
3334 name = "llvm-${version}";
@@ -53,12 +54,6 @@ in stdenv.mkDerivation (rec {
5354 propagatedBuildInputs = [ ncurses zlib ];
5455
5556 patches = [
56− # https://bugs.llvm.org/show_bug.cgi?id=39427
57− # https://github.com/NixOS/nixpkgs/issues/54370
58− (fetchpatch {
59− url = "https://github.com/llvm-mirror/llvm/commit/57567def148f387153a8149fb590bd39b1b006a1.patch";
60− sha256 = "1w1xg5pxpc6cals1nf5j5k4p6qi8lcrpvn0paxc86m415i79xmcg";
61− })
6257 # backport, fix building rust crates with lto
6358 (fetchpatch {
6459 url = "https://github.com/llvm-mirror/llvm/commit/da1fb72bb305d6bc1f3899d541414146934bf80f.patch";
@@ -148,8 +143,9 @@ in stdenv.mkDerivation (rec {
148143 + optionalString (stdenv.isDarwin && enableSharedLibraries) ''
149144 substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \
150145 --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib"
151− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib
152− ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib
146+ ${stdenv.lib.concatMapStringsSep "\n" (v: ''
147+ ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib
148+ '') versionSuffixes}
153149 '';
154150
155151 doCheck = stdenv.isLinux && (!stdenv.isx86_32);
pkgs/development/compilers/llvm/7/openmp.nix+1−1
@@ -9,7 +9,7 @@
99stdenv.mkDerivation {
1010 name = "openmp-${version}";
1111
12− src = fetch "openmp" "030dkg5cypd7j9hq0mcqb5gs31lxwmzfq52j81l7v9ldcy5bf5mz";
12+ src = fetch "openmp" "1dg53wzsci2kra8lh1y0chh60h2l8h1by93br5spzvzlxshkmrqy";
1313
1414 nativeBuildInputs = [ cmake perl ];
1515 buildInputs = [ llvm ];
pkgs/development/compilers/llvm/8/compiler-rt-clock_gettime.patchdeleted−74
@@ -1,74 +0,0 @@
1−commit f00c7bccf7955b7dfbb4859fd9019e9eb3349f2d
2−Author: Tobias Mayer <tobim@fastmail.fm>
3−Date: Wed Feb 13 12:44:17 2019 +0100
4−
5− Provide clock_gettime for xray on macos < 10.12
6−
7−diff --git a/lib/xray/xray_basic_logging.cc b/lib/xray/xray_basic_logging.cc
8−index a46c151af..38aea6932 100644
9−--- a/lib/xray/xray_basic_logging.cc
10−+++ b/lib/xray/xray_basic_logging.cc
11−@@ -36,6 +36,29 @@
12− #include "xray_tsc.h"
13− #include "xray_utils.h"
14−
15−+#if __MACH__
16−+#include <mach/clock.h>
17−+#include <mach/mach.h>
18−+enum clockid_t {
19−+ CLOCK_MONOTONIC = REALTIME_CLOCK,
20−+ CLOCK_REALTIME = REALTIME_CLOCK
21−+};
22−+
23−+int clock_gettime(clockid_t clock_id, struct timespec *ts) {
24−+ if (ts != NULL) {
25−+ clock_serv_t cclock;
26−+ mach_timespec_t mts;
27−+ host_get_clock_service(mach_host_self(), clock_id, &cclock);
28−+ clock_get_time(cclock, &mts);
29−+ mach_port_deallocate(mach_task_self(), cclock);
30−+ ts->tv_sec = mts.tv_sec;
31−+ ts->tv_nsec = mts.tv_nsec;
32−+ return 0;
33−+ }
34−+ return -1;
35−+}
36−+#endif
37−+
38− namespace __xray {
39−
40− SpinMutex LogMutex;
41−diff --git a/lib/xray/xray_fdr_logging.cc b/lib/xray/xray_fdr_logging.cc
42−index 4b308b27f..1d044c8fd 100644
43−--- a/lib/xray/xray_fdr_logging.cc
44−+++ b/lib/xray/xray_fdr_logging.cc
45−@@ -38,6 +38,29 @@
46− #include "xray_tsc.h"
47− #include "xray_utils.h"
48−
49−+#if __MACH__
50−+#include <mach/clock.h>
51−+#include <mach/mach.h>
52−+enum clockid_t {
53−+ CLOCK_MONOTONIC = REALTIME_CLOCK,
54−+ CLOCK_REALTIME = REALTIME_CLOCK
55−+};
56−+
57−+int clock_gettime(clockid_t clock_id, struct timespec *ts) {
58−+ if (ts != NULL) {
59−+ clock_serv_t cclock;
60−+ mach_timespec_t mts;
61−+ host_get_clock_service(mach_host_self(), clock_id, &cclock);
62−+ clock_get_time(cclock, &mts);
63−+ mach_port_deallocate(mach_task_self(), cclock);
64−+ ts->tv_sec = mts.tv_sec;
65−+ ts->tv_nsec = mts.tv_nsec;
66−+ return 0;
67−+ }
68−+ return -1;
69−+}
70−+#endif
71−+
72− namespace __xray {
73−
74− atomic_sint32_t LoggingStatus = {XRayLogInitStatus::XRAY_LOG_UNINITIALIZED};
pkgs/development/compilers/llvm/8/compiler-rt.nix+1−2
@@ -34,8 +34,7 @@ stdenv.mkDerivation rec {
3434 patches = [
3535 ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
3636 ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch
37− ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch
38− ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin ./compiler-rt-clock_gettime.patch;
37+ ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./crtbegin-and-end.patch;
3938
4039 # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
4140 # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
pkgs/development/compilers/rust/default.nix+9−2
@@ -2,6 +2,8 @@
22, buildPackages
33, newScope, callPackage
44, CoreFoundation, Security
5+, llvmPackages_5
6+, pkgsBuildTarget, pkgsBuildBuild, pkgsBuildHost
57}: rec {
68 makeRustPlatform = { rustc, cargo, ... }: {
79 rust = {
@@ -48,10 +50,15 @@
4850 buildRustPackages = buildPackages.rust.packages.stable;
4951 # Analogous to stdenv
5052 rustPlatform = makeRustPlatform self.buildRustPackages;
51− rustc = self.callPackage ./rustc.nix {
53+ rustc = self.callPackage ./rustc.nix ({
5254 # Use boot package set to break cycle
5355 rustPlatform = bootRustPlatform;
54− };
56+ } // lib.optionalAttrs (stdenv.cc.isClang && stdenv.hostPlatform == stdenv.buildPlatform) {
57+ stdenv = llvmPackages_5.stdenv;
58+ pkgsBuildBuild = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages_5.stdenv; };
59+ pkgsBuildHost = pkgsBuildBuild // { targetPackages.stdenv = llvmPackages_5.stdenv; };
60+ pkgsBuildTarget = pkgsBuildTarget // { targetPackages.stdenv = llvmPackages_5.stdenv; };
61+ });
5562 cargo = self.callPackage ./cargo.nix {
5663 # Use boot package set to break cycle
5764 rustPlatform = bootRustPlatform;
pkgs/development/haskell-modules/configuration-nix.nix−19
@@ -128,25 +128,6 @@ self: super: builtins.intersectAttrs super {
128128 # the system-fileio tests use canonicalizePath, which fails in the sandbox
129129 system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;
130130
131− # Prevents needing to add `security_tool` as a run-time dependency for
132− # everything using x509-system to give access to the `security` executable.
133− x509-system = if pkgs.stdenv.hostPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
134− then let inherit (pkgs.darwin) security_tool;
135− in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
136− # darwin.security_tool is broken in Mojave (#45042)
137−
138− # We will use the system provided security for now.
139− # Beware this WILL break in sandboxes!
140−
141− # TODO(matthewbauer): If someone really needs this to work in sandboxes,
142− # I think we can add a propagatedImpureHost dep here, but I’m hoping to
143− # get a proper fix available soonish.
144− postPatch = (drv.postPatch or "") + ''
145− substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
146− '';
147− })
148− else super.x509-system;
149−
150131 # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216
151132 gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
152133 glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.buildHaskellPackages.gtk2hs-buildtools) pkgs.glib) ["fortify"];
pkgs/development/interpreters/guile/2.0.nix+8−1
@@ -46,7 +46,14 @@
4646 })
4747 ./riscv.patch
4848 ] ++
49− (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
49+ (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch)
50+ ++ stdenv.lib.optionals stdenv.isDarwin [
51+ (fetchpatch {
52+ url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
53+ sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
54+ })
55+ ./filter-mkostemp-darwin.patch
56+ ];
5057
5158 # Explicitly link against libgcc_s, to work around the infamous
5259 # "libgcc_s.so.1 must be installed for pthread_cancel to work".
pkgs/development/interpreters/guile/default.nix+6−2
@@ -2,6 +2,7 @@
22, fetchurl, makeWrapper, gawk, pkgconfig
33, libffi, libtool, readline, gmp, boehmgc, libunistring
44, coverageAnalysis ? null
5+, fetchpatch
56}:
67
78# Do either a coverage analysis build or a standard build.
@@ -42,8 +43,11 @@
4243 patches = [
4344 ./eai_system.patch
4445 ./riscv.patch
45− ] ++
46− (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
46+ ] ++ stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch
47+ ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
48+ url = "https://gitlab.gnome.org/GNOME/gtk-osx/raw/52898977f165777ad9ef169f7d4818f2d4c9b731/patches/guile-clocktime.patch";
49+ sha256 = "12wvwdna9j8795x59ldryv9d84c1j3qdk2iskw09306idfsis207";
50+ });
4751
4852 # Explicitly link against libgcc_s, to work around the infamous
4953 # "libgcc_s.so.1 must be installed for pthread_cancel to work".
pkgs/development/interpreters/guile/filter-mkostemp-darwin.patchnew file+28
@@ -0,0 +1,28 @@
1+Filter incompat. mkostemp(3) flags on macOS 10.12
2+
3+macOS Sierra introduces a mkostemp(3) function which is used when
4+present. Contrary to the GNUlib version of mkostemp(3) that was used
5+previously, this version fails with 'invalid argument' when flags other
6+than from a specified set are passed. From mktemp(3):
7+
8+| The mkostemp() function is like mkstemp() but allows specifying
9+| additional open(2) flags (defined in <fcntl.h>). The permitted flags
10+| are O_APPEND, O_SHLOCK, O_EXLOCK and O_CLOEXEC.
11+
12+Signed-off-by: Clemens Lang <cal@macports.org>
13+Upstream-Status: Submitted [https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24862#23]
14+--- a/libguile/filesys.c.orig 2017-01-09 00:53:27.000000000 +0100
15++++ b/libguile/filesys.c 2017-01-09 00:54:48.000000000 +0100
16+@@ -1486,6 +1486,12 @@
17+ mode_bits = scm_i_mode_bits (mode);
18+ }
19+
20++#ifdef __APPLE__
21++ /* macOS starting with 10.12 defines mkostemp(2) which is used if defined,
22++ * but only accepts some flags according to its manpage. It fails with
23++ * invalid argument when other flags are passed. */
24++ open_flags &= O_APPEND | O_SHLOCK | O_EXLOCK | O_CLOEXEC;
25++#endif
26+ SCM_SYSCALL (rv = mkostemp (c_tmpl, open_flags));
27+ if (rv == -1)
28+ SCM_SYSERROR;
pkgs/development/interpreters/python/cpython/2.7/default.nix+1−1
@@ -42,7 +42,7 @@ let
4242 executable = libPrefix;
4343 pythonVersion = with sourceVersion; "${major}.${minor}";
4444 sitePackages = "lib/${libPrefix}/site-packages";
45− inherit pythonForBuild;
45+ inherit hasDistutilsCxxPatch pythonForBuild;
4646 } // {
4747 inherit ucsEncoding;
4848 };
pkgs/development/interpreters/python/cpython/default.nix+1−1
@@ -39,7 +39,7 @@ let
3939 executable = libPrefix;
4040 pythonVersion = with sourceVersion; "${major}.${minor}";
4141 sitePackages = "lib/${libPrefix}/site-packages";
42− inherit pythonForBuild;
42+ inherit hasDistutilsCxxPatch pythonForBuild;
4343 };
4444
4545 version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";
pkgs/development/interpreters/python/default.nix+2−1
@@ -13,6 +13,7 @@ with pkgs;
1313 , pythonVersion
1414 , packageOverrides
1515 , sitePackages
16+ , hasDistutilsCxxPatch
1617 , pythonForBuild
1718 , self
1819 }: let
@@ -40,7 +41,7 @@ with pkgs;
4041 inherit sourceVersion;
4142 pythonAtLeast = lib.versionAtLeast pythonVersion;
4243 pythonOlder = lib.versionOlder pythonVersion;
43− inherit pythonForBuild;
44+ inherit hasDistutilsCxxPatch pythonForBuild;
4445 };
4546
4647in {
pkgs/development/interpreters/python/pypy/default.nix+1
@@ -24,6 +24,7 @@ let
2424 executable = "pypy${if isPy3k then "3" else ""}";
2525 pythonForBuild = self; # No cross-compiling for now.
2626 sitePackages = "site-packages";
27+ hasDistutilsCxxPatch = false;
2728 };
2829 pname = passthru.executable;
2930 version = with sourceVersion; "${major}.${minor}.${patch}";
pkgs/development/interpreters/python/pypy/prebuilt.nix+1
@@ -34,6 +34,7 @@ let
3434 executable = "pypy${if isPy3k then "3" else ""}";
3535 pythonForBuild = self; # Not possible to cross-compile with.
3636 sitePackages = "site-packages";
37+ hasDistutilsCxxPatch = false;
3738 };
3839 pname = "${passthru.executable}_prebuilt";
3940 version = with sourceVersion; "${major}.${minor}.${patch}";
pkgs/development/interpreters/python/setup-hook.sh+3−1
@@ -12,7 +12,9 @@ toPythonPath() {
1212 echo $result
1313}
1414
15−addEnvHooks "$hostOffset" addPythonPath
15+if [ -z "${dontAddPythonPath:-}" ]; then
16+ addEnvHooks "$hostOffset" addPythonPath
17+fi
1618
1719# Determinism: The interpreter is patched to write null timestamps when compiling python files.
1820# This way python doesn't try to update them when we freeze timestamps in nix store.
pkgs/development/interpreters/tcl/8.6.nix+2−2
@@ -2,10 +2,10 @@
22
33callPackage ./generic.nix (args // rec {
44 release = "8.6";
5− version = "${release}.6";
5+ version = "${release}.9";
66
77 src = fetchurl {
88 url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
9− sha256 = "01zypqhy57wvh1ikk28bg733sk5kf4q568pq9v6fvcz4h6bl0rd2";
9+ sha256 = "0kjzj7mkzfnb7ksxanbibibfpciyvsh5ffdlhs0bmfc75kgd435d";
1010 };
1111})
pkgs/development/interpreters/tcl/generic.nix+3−2
@@ -33,11 +33,12 @@ stdenv.mkDerivation rec {
3333 postInstall = ''
3434 make install-private-headers
3535 ln -s $out/bin/tclsh${release} $out/bin/tclsh
36+ ln -s $out/lib/libtcl${release}.so $out/lib/libtcl.so
3637 '';
3738
3839 meta = with stdenv.lib; {
39− description = "The Tcl scription language";
40− homepage = http://www.tcl.tk/;
40+ description = "The Tcl scripting language";
41+ homepage = https://www.tcl.tk/;
4142 license = licenses.tcltk;
4243 platforms = platforms.all;
4344 maintainers = with maintainers; [ vrthra ];
pkgs/development/libraries/boost/1.67.nix+27−5
@@ -3,11 +3,33 @@
33callPackage ./generic.nix (args // rec {
44 version = "1.67.0";
55
6− patches = [ (fetchpatch {
7− url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch";
8− sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h";
9− stripLen = 1;
10− })];
6+ patches = [
7+ (fetchpatch {
8+ url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch";
9+ sha256 = "0x65nkwzv8fdacj8sw5njl3v63jj19dirrpklbwy6qpsncw7fc7h";
10+ stripLen = 1;
11+ })
12+ ] ++ stdenv.lib.optionals stdenv.cc.isClang [
13+ # Fixes https://github.com/boostorg/atomic/issues/15
14+ (fetchpatch {
15+ url = https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534.patch;
16+ sha256 = "102g35ygvv8cxagp9651284xk4vybk93q2fm577y4mdxf5k46b7a";
17+ stripLen = 1;
18+ })
19+
20+ # Needed for the next patch
21+ (fetchpatch {
22+ url = https://github.com/boostorg/asio/commit/38cb19719748ad56b14d73ca1fff5828f36e5894.patch;
23+ sha256 = "0cj9cxz9rfbsx8p8f5alxx00dq3r7g0vh23j68bbxbs9gq1arq2n";
24+ stripLen = 1;
25+ })
26+ # Fixes https://github.com/boostorg/asio/pull/91
27+ (fetchpatch {
28+ url = https://github.com/boostorg/asio/commit/43874d5497414c67655d901e48c939ef01337edb.patch;
29+ sha256 = "1c2ds164s2ygvpb4785p4ncv8ywbpm08cphirb99xp4mqvb693is";
30+ stripLen = 1;
31+ })
32+ ];
1133
1234 src = fetchurl {
1335 url = "mirror://sourceforge/boost/boost_1_67_0.tar.bz2";
pkgs/development/libraries/boost/generic.nix+3−2
@@ -114,8 +114,9 @@ stdenv.mkDerivation {
114114 description = "Collection of C++ libraries";
115115 license = stdenv.lib.licenses.boost;
116116
117− platforms = (platforms.unix ++ platforms.windows);
118− badPlatforms = stdenv.lib.optional (versionOlder version "1.59") "aarch64-linux";
117+ platforms = platforms.unix ++ platforms.windows;
118+ badPlatforms = stdenv.lib.optional (versionOlder version "1.59") "aarch64-linux"
119+ ++ stdenv.lib.optional ((versionOlder version "1.57") || version == "1.58") "x86_64-darwin";
119120 maintainers = with maintainers; [ peti ];
120121 };
121122
pkgs/development/libraries/bullet/default.nix+2
@@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
4040
4141 enableParallelBuilding = true;
4242
43+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=argument-outside-range";
44+
4345 meta = with stdenv.lib; {
4446 description = "A professional free 3D Game Multiphysics Library";
4547 longDescription = ''
pkgs/development/libraries/clucene-core/2.x.nix+2
@@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
3636 # /build/clucene-core-2.3.3.4/build/bin/cl_test"
3737 doCheck = false;
3838
39+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
40+
3941 meta = with stdenv.lib; {
4042 description = "Core library for full-featured text search engine";
4143 longDescription = ''
pkgs/development/libraries/glib/default.nix+2−2
@@ -46,7 +46,7 @@ let
4646 '';
4747
4848 binPrograms = optional (!stdenv.isDarwin) "gapplication" ++ [ "gdbus" "gio" "gsettings" ];
49− version = "2.60.0";
49+ version = "2.60.1";
5050in
5151
5252stdenv.mkDerivation rec {
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
5454
5555 src = fetchurl {
5656 url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
57− sha256 = "0ls3njqknb345ni5i8hn9nr1n70kn6s8bi0g6kcqj3c4js5mv1i0";
57+ sha256 = "0q2mkdvp20v6dvrhik8k5j875kj29hcfz346xi0624n6spsq9y49";
5858 };
5959
6060 patches = optional stdenv.isDarwin ./darwin-compilation.patch
pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch+29−21
@@ -1,6 +1,6 @@
11--- a/giscanner/scannermain.py
22+++ b/giscanner/scannermain.py
3−@@ -101,6 +101,39 @@
3+@@ -95,6 +95,39 @@ def get_windows_option_group(parser):
44 return group
55
66
@@ -40,7 +40,7 @@
4040 def _get_option_parser():
4141 parser = optparse.OptionParser('%prog [options] sources',
4242 version='%prog ' + giscanner.__version__)
43−@@ -211,6 +244,10 @@
43+@@ -205,6 +238,10 @@ match the namespace prefix.""")
4444 parser.add_option("", "--filelist",
4545 action="store", dest="filelist", default=[],
4646 help="file containing headers and sources to be scanned")
@@ -53,7 +53,7 @@
5353 parser.add_option_group(group)
5454--- a/giscanner/shlibs.py
5555+++ b/giscanner/shlibs.py
56−@@ -62,6 +62,12 @@
56+@@ -57,6 +57,12 @@ def _ldd_library_pattern(library_name):
5757 $""" % re.escape(library_name), re.VERBOSE)
5858
5959
@@ -66,21 +66,33 @@
6666 # This is a what we do for non-la files. We assume that we are on an
6767 # ELF-like system where ldd exists and the soname extracted with ldd is
6868 # a filename that can be opened with dlopen().
69−@@ -110,17 +116,16 @@ def _resolve_non_libtool(options, binary, libraries):
70− if isinstance(output, bytes):
69+@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries):
7170 output = output.decode("utf-8", "replace")
7271
73−- # Use absolute paths on OS X to conform to how libraries are usually
74−- # referenced on OS X systems, and file names everywhere else.
75−- basename = platform.system() != 'Darwin'
76−- return resolve_from_ldd_output(libraries, output, basename=basename)
77−+ # Never strip away absolute paths in Nix
78−+ basename = False
79−+ return resolve_from_ldd_output(libraries, output, basename=basename, fallback_libpath=options.fallback_libpath)
72+ shlibs = resolve_from_ldd_output(libraries, output)
73+- return list(map(sanitize_shlib_path, shlibs))
74++ fallback_libpath = options.fallback_libpath or "";
75++ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs)))
8076
8177
82−-def resolve_from_ldd_output(libraries, output, basename=False):
83−+def resolve_from_ldd_output(libraries, output, basename=False, fallback_libpath=""):
78+ def sanitize_shlib_path(lib):
79+@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib):
80+ # In case we get relative paths on macOS (like @rpath) then we fall
81+ # back to the basename as well:
82+ # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
83+- if sys.platform == "darwin":
84+- if not os.path.isabs(lib):
85+- return os.path.basename(lib)
86+- return lib
87+- else:
88++
89++ # Always use absolute paths if available
90++ if not os.path.isabs(lib):
91+ return os.path.basename(lib)
92++ return lib
93+
94+
95+ def resolve_from_ldd_output(libraries, output):
8496 patterns = {}
8597 for library in libraries:
8698 if not os.path.isfile(library):
@@ -89,7 +101,7 @@
89101 if len(patterns) == 0:
90102 return []
91103
92−@@ -129,11 +134,14 @@ def resolve_from_ldd_output(libraries, output, basename=False):
104+@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output):
93105 if line.endswith(':'):
94106 continue
95107 for word in line.split():
@@ -102,14 +114,10 @@
102114+ m = pattern.match(word)
103115 if m:
104116 del patterns[library]
105−- shlibs.append(_sanitize_install_name(m.group()))
106−+ shlibs.append(os.path.join(fallback_libpath, _sanitize_install_name(m.group())))
107− break
108−
109− if len(patterns) > 0:
117+ shlibs.append(m.group())
110118--- a/giscanner/utils.py
111119+++ b/giscanner/utils.py
112−@@ -116,17 +116,11 @@
120+@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file):
113121 if dlname is None:
114122 return None
115123
pkgs/development/libraries/gobject-introspection/default.nix+2−3
@@ -9,7 +9,7 @@
99
1010let
1111 pname = "gobject-introspection";
12− version = "1.60.0";
12+ version = "1.60.1";
1313in
1414with stdenv.lib;
1515stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
1717
1818 src = fetchurl {
1919 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
20− sha256 = "0pgk9lcvz3i79m6g2ynlp00ghws7g0p0d5qyf0k72warrf841zly";
20+ sha256 = "1cr4r3lh5alrks9q2ycs1kn2crnkhrhn2wrmibng6dndkr4x2i6q";
2121 };
2222
2323 outputs = [ "out" "dev" "man" ];
@@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
4040 setupHook = ./setup-hook.sh;
4141
4242 patches = [
43− ./macos-shared-library.patch
4443 (substituteAll {
4544 src = ./test_shlibs.patch;
4645 inherit nixStoreDir;
pkgs/development/libraries/gobject-introspection/macos-shared-library.patchdeleted−36
@@ -1,36 +0,0 @@
1−diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
2−index c93d20c..4d4915d 100644
3−--- a/giscanner/shlibs.py
4−+++ b/giscanner/shlibs.py
5−@@ -43,6 +43,22 @@ def _resolve_libtool(options, binary, libraries):
6−
7− return shlibs
8−
9−+def _sanitize_install_name(install_name):
10−+ '''
11−+ On macOS, the dylib can be built with install_name as @rpath/libfoo.so
12−+ instead of the absolute path to the library, so handle that. The name
13−+ can also be @loader_path or @executable_path.
14−+ '''
15−+ if not install_name.startswith('@'):
16−+ return install_name
17−+ if install_name.startswith('@rpath/'):
18−+ return install_name[7:]
19−+ if install_name.startswith('@loader_path/'):
20−+ return install_name[13:]
21−+ if install_name.startswith('@executable_path/'):
22−+ return install_name[17:]
23−+ raise RuntimeError('Unknown install_name {!r}'.format(install_name))
24−+
25−
26− # Assume ldd output is something vaguely like
27− #
28−@@ -136,7 +152,7 @@ def resolve_from_ldd_output(libraries, output, basename=False):
29− m = pattern.match(word)
30− if m:
31− del patterns[library]
32−- shlibs.append(m.group())
33−+ shlibs.append(_sanitize_install_name(m.group()))
34− break
35−
36− if len(patterns) > 0:
pkgs/development/libraries/gobject-introspection/test_shlibs.patch+12−19
@@ -1,6 +1,6 @@
11--- a/tests/scanner/test_shlibs.py
22+++ b/tests/scanner/test_shlibs.py
3−@@ -10,6 +10,46 @@ from giscanner.shlibs import resolve_from_ldd_output
3+@@ -7,6 +7,30 @@ from giscanner.shlibs import resolve_from_ldd_output, sanitize_shlib_path
44
55 class TestLddParser(unittest.TestCase):
66
@@ -26,25 +26,18 @@
2626+ self.assertEqual(
2727+ ['@nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libglib-2.0.so.0',
2828+ '@nixStoreDir@/gmrf09y7sfxrr0mcx90dba7w41jj2kzk-glib-2.58.1/lib/libgio-2.0.so.0'],
29−+ resolve_from_ldd_output(libraries, output, basename=False))
30−+
31−+ def test_resolve_from_ldd_output_macos(self):
32−+ output = '''\
33−+ @rpath/libatk-1.0.0.dylib
34−+ @rpath/libgstreamer-1.0.0.dylib (compatibility version 0.0.0, current version 0.0.0)
35−+ /Volumes/USB_SSD/cerbero/build/dist/darwin_x86_64/lib/libglib-2.0.0.dylib (compatibility version 0.0.0, current version 0.0.0)
36−+ /Volumes/USB_SSD/cerbero/build/dist/darwin_x86_64/lib/libintl.dylib (compatibility version 0.0.0, current version 0.0.0)
37−+ /Volumes/USB_SSD/cerbero/build/dist/darwin_x86_64/lib/libgobject-2.0.0.dylib (compatibility version 0.0.0, current version 0.0.0)
38−+ /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1252.50.4)
39−+ '''
40−+ libraries = ['atk-1.0']
41−+ fallback_libpath = '@nixStoreDir@/1ynd5b01z87c1nw75k5iy7sq49hpkw53-atk-2.30.0/lib'
42−+
43−+ self.assertEqual(
44−+ [ '%s/libatk-1.0.0.dylib' % fallback_libpath ],
45−+ resolve_from_ldd_output(libraries, output, basename=False, fallback_libpath=fallback_libpath))
29++ resolve_from_ldd_output(libraries, output))
4630+
4731 def test_resolve_from_ldd_output(self):
4832 output = '''\
4933 libglib-2.0.so.0 => /usr/lib/x86_64-linux-gnu/libglib-2.0.so.0 (0x00007fbe12d68000)
50−
34+@@ -40,7 +64,8 @@ class TestLddParser(unittest.TestCase):
35+
36+ self.assertEqual(
37+ sanitize_shlib_path('/foo/bar'),
38+- '/foo/bar' if sys.platform == 'darwin' else 'bar')
39++ # NixOS always want the absolute path
40++ '/foo/bar')
41+
42+ def test_unresolved_library(self):
43+ output = ''
pkgs/development/libraries/libao/default.nix+1−1
@@ -1,5 +1,5 @@
11{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, libpulseaudio, alsaLib, libcap
2−, CoreAudio, CoreServices, AudioUnit
2+, CoreAudio, CoreServices, AudioUnit, AudioToolbox
33, usePulseAudio }:
44
55stdenv.mkDerivation rec {
pkgs/development/libraries/libcdio/default.nix+1−1
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 buildInputs = [ libcddb ncurses help2man ]
1717 ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ];
1818
19− doCheck = true;
19+ doCheck = !stdenv.isDarwin;
2020
2121 meta = with stdenv.lib; {
2222 description = "A library for OS-independent CD-ROM and CD image access";
pkgs/development/libraries/libcroco/default.nix+3−16
@@ -1,27 +1,14 @@
1−{ stdenv, fetchurl, pkgconfig, libxml2, glib, fetchpatch, gnome3 }:
1+{ stdenv, fetchurl, pkgconfig, libxml2, glib, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "libcroco";
5− version = "0.6.12";
5+ version = "0.6.13";
66
77 src = fetchurl {
88 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9− sha256 = "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x";
9+ sha256 = "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn";
1010 };
1111
12− patches = [
13− (fetchpatch {
14− name = "CVE-2017-7960.patch";
15− url = https://gitlab.gnome.org/GNOME/libcroco/commit/898e3a8c8c0314d2e6b106809a8e3e93cf9d4394.patch;
16− sha256 = "1xjwdqijxf4b7mhdp3kkgnb6c14y0bn3b3gg79kyrm82x696d94l";
17− })
18− (fetchpatch {
19− name = "CVE-2017-7961.patch";
20− url = https://gitlab.gnome.org/GNOME/libcroco/commit/9ad72875e9f08e4c519ef63d44cdbd94aa9504f7.patch;
21− sha256 = "0zakd72ynzjgzskwyvqglqiznsb93j1bkvc1lgyrzgv9rwrbwv9s";
22− })
23− ];
24−
2512 outputs = [ "out" "dev" ];
2613 outputBin = "dev";
2714
pkgs/development/libraries/libdrm/default.nix−5
@@ -14,17 +14,12 @@ stdenv.mkDerivation rec {
1414 buildInputs = [ libpthreadstubs libpciaccess valgrind-light ];
1515 # libdrm as of 2.4.70 does not actually do anything with udev.
1616
17− patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch;
18−
1917 postPatch = ''
2018 for a in */*-symbol-check ; do
2119 patchShebangs $a
2220 done
2321 '';
2422
25− preConfigure = stdenv.lib.optionalString stdenv.isDarwin
26− "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
27−
2823 configureFlags = [ "--enable-install-test-programs" ]
2924 ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64)
3025 [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
pkgs/development/libraries/libdrm/libdrm-apple.patchdeleted−88
@@ -1,88 +0,0 @@
1−diff -Naur libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c libdrm-2.4.26/intel/intel_bufmgr_gem.c
2−--- libdrm-2.4.26-orig/intel/intel_bufmgr_gem.c 2011-04-01 10:30:51.000000000 -0400
3−+++ libdrm-2.4.26/intel/intel_bufmgr_gem.c 2011-08-29 02:17:20.000000000 -0400
4−@@ -51,6 +51,7 @@
5− #include <sys/stat.h>
6− #include <sys/types.h>
7− #include <stdbool.h>
8−+#include <sys/time.h>
9−
10− #include "errno.h"
11− #include "libdrm_lists.h"
12−@@ -987,9 +988,9 @@
13− if (atomic_dec_and_test(&bo_gem->refcount)) {
14− drm_intel_bufmgr_gem *bufmgr_gem =
15− (drm_intel_bufmgr_gem *) bo->bufmgr;
16−- struct timespec time;
17−+ struct timeval time;
18−
19−- clock_gettime(CLOCK_MONOTONIC, &time);
20−+ gettimeofday(&time, NULL);
21−
22− pthread_mutex_lock(&bufmgr_gem->lock);
23− drm_intel_gem_bo_unreference_final(bo, time.tv_sec);
24−diff -Naur libdrm-2.4.26-orig/xf86drm.c libdrm-2.4.26/xf86drm.c
25−--- libdrm-2.4.26-orig/xf86drm.c 2011-03-21 09:39:24.000000000 -0400
26−+++ libdrm-2.4.26/xf86drm.c 2011-08-29 02:17:49.000000000 -0400
27−@@ -51,6 +51,9 @@
28− #include <sys/mman.h>
29− #include <sys/time.h>
30− #include <stdarg.h>
31−+#if defined(__APPLE__) && defined(__MACH__)
32−+#include <mach/mach_time.h>
33−+#endif
34−
35− /* Not all systems have MAP_FAILED defined */
36− #ifndef MAP_FAILED
37−@@ -1941,20 +1944,43 @@
38− */
39− int drmWaitVBlank(int fd, drmVBlankPtr vbl)
40− {
41−+#if defined(__APPLE__) && defined(__MACH__)
42−+ uint64_t start, end, elapsed, elapsedNano;
43−+ static const uint64_t maxElapsed = 2000000000;
44−+ static mach_timebase_info_data_t timebaseInfo;
45−+ if ( timebaseInfo.denom == 0 ) {
46−+ (void) mach_timebase_info(&timebaseInfo);
47−+ }
48−+#else
49− struct timespec timeout, cur;
50−+#endif
51− int ret;
52−
53−+#if defined(__APPLE__) && defined(__MACH__)
54−+ start = mach_absolute_time();
55−+#else
56− ret = clock_gettime(CLOCK_MONOTONIC, &timeout);
57− if (ret < 0) {
58− fprintf(stderr, "clock_gettime failed: %s\n", strerror(ret));
59− goto out;
60− }
61− timeout.tv_sec++;
62−+#endif
63−
64− do {
65− ret = ioctl(fd, DRM_IOCTL_WAIT_VBLANK, vbl);
66− vbl->request.type &= ~DRM_VBLANK_RELATIVE;
67− if (ret && errno == EINTR) {
68−+#if defined(__APPLE__) && defined(__MACH__)
69−+ end = mach_absolute_time();
70−+ elapsed = end - start;
71−+ elapsedNano = elapsed * timebaseInfo.numer / timebaseInfo.denom;
72−+ if (elapsedNano > maxElapsed) {
73−+ errno = EBUSY;
74−+ ret = -1;
75−+ break;
76−+ }
77−+#else
78− clock_gettime(CLOCK_MONOTONIC, &cur);
79− /* Timeout after 1s */
80− if (cur.tv_sec > timeout.tv_sec + 1 ||
81−@@ -1964,6 +1990,7 @@
82− ret = -1;
83− break;
84− }
85−+#endif
86− }
87− } while (ret && errno == EINTR);
88−
pkgs/development/libraries/libproxy/default.nix+7−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib
1+{ stdenv, fetchFromGitHub, pkgconfig, cmake, zlib, fetchpatch
22, dbus, networkmanager, spidermonkey_38, pcre, python2, python3
33, SystemConfiguration, CoreFoundation, JavaScriptCore }:
44
@@ -30,6 +30,12 @@ stdenv.mkDerivation rec {
3030 )
3131 '';
3232
33+ patches = stdenv.lib.optional stdenv.isDarwin
34+ (fetchpatch {
35+ url = "https://github.com/libproxy/libproxy/commit/44158f03f8522116758d335688ed840dfcb50ac8.patch";
36+ sha256 = "0axfvb6j7gcys6fkwi9dkn006imhvm3kqr83gpwban8419n0q5v1";
37+ });
38+
3339 doCheck = false; # fails 1 out of 10 tests
3440
3541 meta = with stdenv.lib; {
pkgs/development/libraries/libsnark/darwin-fix-clock-gettime.patchdeleted−41
@@ -1,41 +0,0 @@
1−Adapted from https://github.com/zcash/libsnark/pull/10
2−
3−diff --git a/depends/libff/libff/common/profiling.cpp b/depends/libff/libff/common/profiling.cpp
4−index f2a1985..319149c 100755
5−--- a/depends/libff/libff/common/profiling.cpp
6−+++ b/depends/libff/libff/common/profiling.cpp
7−@@ -27,6 +27,13 @@
8− #include <proc/readproc.h>
9− #endif
10−
11−+#ifdef __MACH__
12−+#include <time.h>
13−+#include <sys/time.h>
14−+#include <mach/clock.h>
15−+#include <mach/mach.h>
16−+#endif
17−+
18− namespace libff {
19−
20− long long get_nsec_time()
21−@@ -42,10 +49,20 @@ long long get_nsec_cpu_time()
22− return 0;
23− #else
24− ::timespec ts;
25−+#ifdef __MACH__
26−+ clock_serv_t cclock;
27−+ mach_timespec_t mts;
28−+ host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
29−+ clock_get_time(cclock, &mts);
30−+ mach_port_deallocate(mach_task_self(), cclock);
31−+ ts.tv_sec = mts.tv_sec;
32−+ ts.tv_nsec = mts.tv_nsec;
33−+#else
34− if ( ::clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts) )
35− throw ::std::runtime_error("clock_gettime(CLOCK_PROCESS_CPUTIME_ID) failed");
36− // If we expected this to work, don't silently ignore failures, because that would hide the problem and incur an unnecessarily system-call overhead. So if we ever observe this exception, we should probably add a suitable #ifdef .
37− //TODO: clock_gettime(CLOCK_PROCESS_CPUTIME_ID) is not supported by native Windows. What about Cygwin? Should we #ifdef on CLOCK_PROCESS_CPUTIME_ID or on __linux__?
38−+#endif
39− return ts.tv_sec * 1000000000ll + ts.tv_nsec;
40− #endif
41− }
pkgs/development/libraries/libsnark/default.nix−2
@@ -19,8 +19,6 @@ in stdenv.mkDerivation rec {
1919 fetchSubmodules = true;
2020 };
2121
22− patches = [ ./darwin-fix-clock-gettime.patch ];
23−
2422 enableParallelBuilding = true;
2523
2624 meta = with stdenv.lib; {
pkgs/development/libraries/libsoup/default.nix+2−2
@@ -5,11 +5,11 @@
55stdenv.mkDerivation rec {
66 name = "${pname}-${version}";
77 pname = "libsoup";
8− version = "2.66.0";
8+ version = "2.66.1";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
12− sha256 = "08c9kkdhzy504gv23pfdm4sq3dd3j20sikwz6gv0qrwcdjnw5bai";
12+ sha256 = "1zs3bhspwg7fggxd7x1rrggpkcf2j9ch6dhncq9syh252z0vcb2a";
1313 };
1414
1515 postPatch = ''
pkgs/development/libraries/libtins/default.nix+5−1
@@ -31,7 +31,11 @@ stdenv.mkDerivation rec {
3131
3232 enableParallelBuilding = true;
3333 doCheck = true;
34− checkPhase = "make tests && LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib make test";
34+ preCheck = ''
35+ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib
36+ export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$PWD/lib
37+ '';
38+ checkTarget = "tests test";
3539
3640 meta = with stdenv.lib; {
3741 description = "High-level, multiplatform C++ network packet sniffing and crafting library";
pkgs/development/libraries/libuv/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, lib, fetchpatch, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
22
33stdenv.mkDerivation rec {
4− version = "1.27.0";
4+ version = "1.28.0";
55 pname = "libuv";
66
77 src = fetchFromGitHub {
88 owner = pname;
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "1nhd3772qymlv0b251wg9rrqz279vki4hnd4s23yyll0kpmzkpac";
11+ sha256 = "0l0gx69sdy3sv3pirjbca2ws54n9d83mj0j96h77k0ncywimvi64";
1212 };
1313
1414 postPatch = let
pkgs/development/libraries/libva/default.nix+2−2
@@ -6,14 +6,14 @@
66
77stdenv.mkDerivation rec {
88 name = "libva-${lib.optionalString minimal "minimal-"}${version}";
9− version = "2.4.0";
9+ version = "2.4.1";
1010
1111 # update libva-utils and vaapiIntel as well
1212 src = fetchFromGitHub {
1313 owner = "01org";
1414 repo = "libva";
1515 rev = version;
16− sha256 = "1b58n6rjfsfjfw1s5kdfa0jpfiqs83g2w14s7sfp1qkckkz3988l";
16+ sha256 = "06kqff05jhd87yi53gyc2qivgg4sbf19qyznm9s4dyz92k04cl5c";
1717 };
1818
1919 outputs = [ "dev" "out" ];
pkgs/development/libraries/libxslt/default.nix+9−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2, libgcrypt
1+{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs, python2, libgcrypt
22, cryptoSupport ? false
33, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
44}:
@@ -18,6 +18,14 @@ stdenv.mkDerivation rec {
1818 sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf";
1919 };
2020
21+ patches = [
22+ (fetchpatch {
23+ name = "CVE-2019-11068.patch";
24+ url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch";
25+ sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8";
26+ })
27+ ];
28+
2129 outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
2230
2331 buildInputs = [ libxml2.dev ]
pkgs/development/libraries/mesa/darwin-clock-gettime.patchdeleted−76
@@ -1,76 +0,0 @@
1−diff --git a/include/c11/threads_posix.h b/include/c11/threads_posix.h
2−index 45cb6075e6..62937311b9 100644
3−--- a/include/c11/threads_posix.h
4−+++ b/include/c11/threads_posix.h
5−@@ -36,6 +36,11 @@
6− #include <sched.h>
7− #include <stdint.h> /* for intptr_t */
8−
9−+#ifdef __MACH__
10−+#include <mach/clock.h>
11−+#include <mach/mach.h>
12−+#endif
13−+
14− /*
15− Configuration macro:
16−
17−@@ -383,12 +388,25 @@ tss_set(tss_t key, void *val)
18− /*-------------------- 7.25.7 Time functions --------------------*/
19− // 7.25.6.1
20− #ifndef HAVE_TIMESPEC_GET
21−+
22− static inline int
23− timespec_get(struct timespec *ts, int base)
24− {
25− if (!ts) return 0;
26− if (base == TIME_UTC) {
27−+#ifdef __MACH__
28−+ if (ts != NULL) {
29−+ clock_serv_t cclock;
30−+ mach_timespec_t mts;
31−+ host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
32−+ clock_get_time(cclock, &mts);
33−+ mach_port_deallocate(mach_task_self(), cclock);
34−+ ts->tv_sec = mts.tv_sec;
35−+ ts->tv_nsec = mts.tv_nsec;
36−+ }
37−+#else
38− clock_gettime(CLOCK_REALTIME, ts);
39−+#endif
40− return base;
41− }
42− return 0;
43−diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
44−index 1208ebb315..e1378fb1f0 100644
45−--- a/src/egl/drivers/dri2/egl_dri2.c
46−+++ b/src/egl/drivers/dri2/egl_dri2.c
47−@@ -65,6 +65,11 @@
48− #include "util/u_vector.h"
49− #include "mapi/glapi/glapi.h"
50−
51−+#ifdef __MACH__
52−+#include <mach/clock.h>
53−+#include <mach/mach.h>
54−+#endif
55−+
56− #define NUM_ATTRIBS 12
57−
58− static void
59−@@ -3092,7 +3097,17 @@ dri2_client_wait_sync(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSync *sync,
60−
61− /* We override the clock to monotonic when creating the condition
62− * variable. */
63−+#ifdef __MACH__
64−+ clock_serv_t cclock;
65−+ mach_timespec_t mts;
66−+ host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
67−+ clock_get_time(cclock, &mts);
68−+ mach_port_deallocate(mach_task_self(), cclock);
69−+ current.tv_sec = mts.tv_sec;
70−+ current.tv_nsec = mts.tv_nsec;
71−+#else
72− clock_gettime(CLOCK_MONOTONIC, &current);
73−+#endif
74−
75− /* calculating when to expire */
76− expire.tv_nsec = timeout % 1000000000L;
pkgs/development/libraries/mesa/default.nix+1−1
@@ -93,7 +93,7 @@ let self = stdenv.mkDerivation {
9393 ./symlink-drivers.patch
9494 ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl
9595 ./disk_cache-include-dri-driver-path-in-cache-key.patch
96− ] ++ lib.optional stdenv.isDarwin ./darwin-clock-gettime.patch;
96+ ];
9797
9898 outputs = [ "out" "dev" "drivers" ]
9999 ++ lib.optional (elem "swrast" galliumDrivers) "osmesa";
pkgs/development/libraries/polkit/default.nix+15−23
@@ -1,5 +1,5 @@
11{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam, perl
2−, intltool, spidermonkey_52 , gobject-introspection, libxslt, docbook_xsl, dbus
2+, intltool, spidermonkey_60 , gobject-introspection, libxslt, docbook_xsl, dbus
33, docbook_xml_dtd_412, gtk-doc, coreutils
44, useSystemd ? stdenv.isLinux, systemd
55, withGnome ? true
@@ -14,28 +14,14 @@ let
1414in
1515
1616stdenv.mkDerivation rec {
17− name = "polkit-0.115";
17+ pname = "polkit";
18+ version = "0.116";
1819
1920 src = fetchurl {
20− url = "https://www.freedesktop.org/software/polkit/releases/${name}.tar.gz";
21− sha256 = "0c91y61y4gy6p91cwbzg32dhavw4b7fflg370rimqhdxpzdfr1rg";
21+ url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.gz";
22+ sha256 = "1c9lbpndh5zis22f154vjrhnqw65z8s85nrgl42v738yf6g0q5w8";
2223 };
2324
24− patches = [
25− # CVE-2019-6133 - See: https://bugs.chromium.org/p/project-zero/issues/detail?id=1692
26− (fetchpatch {
27− url = "https://gitlab.freedesktop.org/polkit/polkit/commit/6cc6aafee135ba44ea748250d7d29b562ca190e3.patch";
28− name = "CVE-2019-6133.patch";
29− sha256 = "0jjlbjzqcz96xh6w3nv3ss9jl0hhrcd7jg4aa5advf08ibaj29r1";
30− })
31− # CVE-2018-19788 - high UID fixup
32− (fetchpatch {
33− url = "https://gitlab.freedesktop.org/polkit/polkit/commit/5230646dc6876ef6e27f57926b1bad348f636147.patch";
34− name = "CVE-2018-19788.patch";
35− sha256 = "1y3az4mlxx8k1zcss5qm7k102s7k1kqgcfnf11j9678fh7p008vp";
36− })
37− ];
38−
3925 postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
4026 sed -i -e "s/-Wl,--as-needed//" configure.ac
4127 '';
@@ -46,7 +32,7 @@ stdenv.mkDerivation rec {
4632 [ glib gtk-doc pkgconfig intltool perl ]
4733 ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages
4834 buildInputs =
49− [ glib expat pam spidermonkey_52 ]
35+ [ glib expat pam spidermonkey_60 ]
5036 ++ stdenv.lib.optional useSystemd systemd
5137 ++ stdenv.lib.optional withGnome gobject-introspection;
5238
@@ -72,15 +58,21 @@ stdenv.mkDerivation rec {
7258 configureFlags = [
7359 "--datadir=${system}/share"
7460 "--sysconfdir=/etc"
75− "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
61+ "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system"
7662 "--with-polkitd-user=polkituser" #TODO? <nixos> config.ids.uids.polkituser
7763 "--with-os-type=NixOS" # not recognized but prevents impurities on non-NixOS
7864 (if withGnome then "--enable-introspection" else "--disable-introspection")
7965 ] ++ stdenv.lib.optional (!doCheck) "--disable-test";
8066
81− makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0 INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
67+ makeFlags = [
68+ "INTROSPECTION_GIRDIR=${placeholder "out"}/share/gir-1.0"
69+ "INTROSPECTION_TYPELIBDIR=${placeholder "out"}/lib/girepository-1.0"
70+ ];
8271
83− installFlags=["datadir=$(out)/share" "sysconfdir=$(out)/etc"];
72+ installFlags = [
73+ "datadir=${placeholder "out"}/share"
74+ "sysconfdir=${placeholder "out"}/etc"
75+ ];
8476
8577 inherit doCheck;
8678 checkInputs = [dbus];
pkgs/development/libraries/qt-4.x/4.8/default.nix+1
@@ -231,5 +231,6 @@ stdenv.mkDerivation rec {
231231 license = lib.licenses.lgpl21Plus; # or gpl3
232232 maintainers = with lib.maintainers; [ orivej lovek323 phreedom sander ];
233233 platforms = lib.platforms.unix;
234+ badPlatforms = [ "x86_64-darwin" ];
234235 };
235236}
pkgs/development/libraries/qt-5/5.11/default.nix+11−21
@@ -20,7 +20,7 @@ top-level attribute to `top-level/all-packages.nix`.
2020 stdenv, fetchurl, fetchFromGitHub, makeSetupHook,
2121 bison, cups ? null, harfbuzz, libGL, perl,
2222 gstreamer, gst-plugins-base, gtk3, dconf,
23− cf-private,
23+ cf-private, llvmPackages_5,
2424
2525 # options
2626 developerBuild ? false,
@@ -51,34 +51,24 @@ let
5151 patches = {
5252 qtbase = [
5353 ./qtbase.patch
54− ./qtbase-darwin.patch
55− ./qtbase-revert-no-macos10.10.patch
5654 ./qtbase-fixguicmake.patch
57− ] ++ optionals stdenv.isDarwin [
58− ./qtbase-darwin-nseventtype.patch
59− ./qtbase-darwin-revert-69221.patch
6055 ];
6156 qtdeclarative = [ ./qtdeclarative.patch ];
6257 qtscript = [ ./qtscript.patch ];
6358 qtserialport = [ ./qtserialport.patch ];
6459 qttools = [ ./qttools.patch ];
65− qtwebengine = [ ./qtwebengine-no-build-skip.patch ]
66− ++ optional stdenv.cc.isClang ./qtwebengine-clang-fix.patch
67− ++ optionals stdenv.isDarwin [
68− ./qtwebengine-darwin-no-platform-check.patch
69− ./qtwebengine-darwin-sdk-10.10.patch
70− ./qtwebengine-darwin-old-sdk.patch
71− ];
72− qtwebkit = [ ./qtwebkit.patch ]
73− ++ optionals stdenv.isDarwin [
74− ./qtwebkit-darwin-no-readline.patch
75− ./qtwebkit-darwin-no-qos-classes.patch
76− ];
60+ qtwebengine = [
61+ ./qtwebengine-no-build-skip.patch
62+ ./qtwebengine-darwin-no-platform-check.patch
63+ ];
64+ qtwebkit = [ ./qtwebkit.patch ];
7765 };
7866
7967 mkDerivation =
80− import ../mkDerivation.nix
81− { inherit stdenv; inherit (stdenv) lib; }
68+ import ../mkDerivation.nix {
69+ inherit (stdenv) lib;
70+ stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
71+ }
8272 { inherit debug; };
8373
8474 qtModule =
@@ -109,7 +99,7 @@ let
10999 qtdoc = callPackage ../modules/qtdoc.nix {};
110100 qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
111101 qtimageformats = callPackage ../modules/qtimageformats.nix {};
112− qtlocation = callPackage ../modules/qtlocation.nix {};
102+ qtlocation = callPackage ../modules/qtlocation.nix { };
113103 qtmacextras = callPackage ../modules/qtmacextras.nix {
114104 inherit cf-private;
115105 };
pkgs/development/libraries/qt-5/5.11/qtbase-darwin-nseventtype.patchdeleted−13
@@ -1,13 +0,0 @@
1−--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
2−+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
3−@@ -404,8 +404,8 @@ void QCocoaWindow::setVisible(bool visible)
4− removeMonitor();
5− monitor = [NSEvent addGlobalMonitorForEventsMatchingMask:NSLeftMouseDownMask|NSRightMouseDownMask|NSOtherMouseDownMask|NSMouseMovedMask handler:^(NSEvent *e) {
6− QPointF localPoint = QCocoaScreen::mapFromNative([NSEvent mouseLocation]);
7−- const auto button = e.type == NSEventTypeMouseMoved ? Qt::NoButton : cocoaButton2QtButton([e buttonNumber]);
8−- const auto eventType = e.type == NSEventTypeMouseMoved ? QEvent::MouseMove : QEvent::MouseButtonPress;
9−+ const auto button = e.type == NSMouseMoved ? Qt::NoButton : cocoaButton2QtButton([e buttonNumber]);
10−+ const auto eventType = e.type == NSMouseMoved ? QEvent::MouseMove : QEvent::MouseButtonPress;
11− QWindowSystemInterface::handleMouseEvent(window(), window()->mapFromGlobal(localPoint.toPoint()), localPoint,
12− Qt::MouseButtons(uint(NSEvent.pressedMouseButtons & 0xFFFF)), button, eventType);
13− }];
pkgs/development/libraries/qt-5/5.11/qtbase-darwin-revert-69221.patchdeleted−73
@@ -1,73 +0,0 @@
1−diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
2−index 00c3f7c22c..94d35f59d6 100644
3−--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
4−+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
5−@@ -1355,15 +1355,6 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel)
6− {
7− QMacAutoReleasePool pool;
8−
9−- Qt::WindowType type = window()->type();
10−- Qt::WindowFlags flags = window()->flags();
11−-
12−- // Note: The macOS window manager has a bug, where if a screen is rotated, it will not allow
13−- // a window to be created within the area of the screen that has a Y coordinate (I quadrant)
14−- // higher than the height of the screen in its non-rotated state, unless the window is
15−- // created with the NSWindowStyleMaskBorderless style mask.
16−- NSWindowStyleMask styleMask = windowStyleMask(flags);
17−-
18− QRect rect = geometry();
19−
20− QScreen *targetScreen = nullptr;
21−@@ -1375,22 +1366,26 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel)
22− }
23−
24− if (!targetScreen) {
25−- qCWarning(lcQpaCocoaWindow) << "Window position" << rect << "outside any known screen, using primary screen";
26−+ qCWarning(lcQpaCocoaWindow) << "Window position outside any known screen, using primary screen";
27− targetScreen = QGuiApplication::primaryScreen();
28−- // AppKit will only reposition a window that's outside the target screen area if
29−- // the window has a title bar. If left out, the window ends up with no screen.
30−- // The style mask will be corrected to the original style mask in setWindowFlags.
31−- styleMask |= NSWindowStyleMaskTitled;
32− }
33−
34− rect.translate(-targetScreen->geometry().topLeft());
35− QCocoaScreen *cocoaScreen = static_cast<QCocoaScreen *>(targetScreen->handle());
36− NSRect frame = QCocoaScreen::mapToNative(rect, cocoaScreen);
37−
38−+ // Note: The macOS window manager has a bug, where if a screen is rotated, it will not allow
39−+ // a window to be created within the area of the screen that has a Y coordinate (I quadrant)
40−+ // higher than the height of the screen in its non-rotated state, unless the window is
41−+ // created with the NSWindowStyleMaskBorderless style mask.
42−+
43−+ Qt::WindowType type = window()->type();
44−+ Qt::WindowFlags flags = window()->flags();
45−+
46− // Create NSWindow
47− Class windowClass = shouldBePanel ? [QNSPanel class] : [QNSWindow class];
48− QCocoaNSWindow *nsWindow = [[windowClass alloc] initWithContentRect:frame
49−- styleMask:styleMask
50−+ styleMask:windowStyleMask(flags)
51− // Deferring window creation breaks OpenGL (the GL context is
52− // set up before the window is shown and needs a proper window)
53− backing:NSBackingStoreBuffered defer:NO
54−@@ -1399,9 +1394,6 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel)
55− Q_ASSERT_X(nsWindow.screen == cocoaScreen->nativeScreen(), "QCocoaWindow",
56− "Resulting NSScreen should match the requested NSScreen");
57−
58−- if (targetScreen != window()->screen())
59−- QWindowSystemInterface::handleWindowScreenChanged(window(), targetScreen);
60−-
61− nsWindow.delegate = [[QNSWindowDelegate alloc] initWithQCocoaWindow:this];
62−
63− // Prevent Cocoa from releasing the window on close. Qt
64−@@ -1421,6 +1413,9 @@ QCocoaNSWindow *QCocoaWindow::createNSWindow(bool shouldBePanel)
65− });
66− }
67−
68−+ if (targetScreen != window()->screen())
69−+ QWindowSystemInterface::handleWindowScreenChanged(window(), targetScreen);
70−+
71− nsWindow.restorable = NO;
72− nsWindow.level = windowLevel(flags);
73−
pkgs/development/libraries/qt-5/5.11/qtbase-darwin.patchdeleted−70
@@ -1,70 +0,0 @@
1−diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
2−index 341d3bccf2..3368234c26 100644
3−--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
4−+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
5−@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations()
6− QMacAutoReleasePool pool;
7− userProfiles.clear();
8−
9−- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
10−+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
11− for (NSString *ifName in wifiInterfaces) {
12−
13− CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName];
14−@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate()
15−
16− QMacAutoReleasePool pool;
17−
18−- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
19−+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
20− for (NSString *ifName in wifiInterfaces) {
21− scanThread->interfaceName = QString::fromNSString(ifName);
22− scanThread->start();
23−diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcocoascreen.mm
24−index a17a02b629..d76c42fa03 100644
25−--- a/src/plugins/platforms/cocoa/qcocoascreen.mm
26−+++ b/src/plugins/platforms/cocoa/qcocoascreen.mm
27−@@ -114,7 +114,7 @@ void QCocoaScreen::updateGeometry()
28− return;
29−
30− // The reference screen for the geometry is always the primary screen
31−- QRectF primaryScreenGeometry = QRectF::fromCGRect([[NSScreen screens] firstObject].frame);
32−+ QRectF primaryScreenGeometry = QRectF::fromCGRect([[[NSScreen screens] firstObject] frame]);
33− m_geometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.frame), primaryScreenGeometry).toRect();
34− m_availableGeometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.visibleFrame), primaryScreenGeometry).toRect();
35−
36−diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
37−index 72f3bc0075..a9c058a850 100644
38−--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
39−+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
40−@@ -1676,7 +1676,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window)
41−
42− if (!m_drawContentBorderGradient) {
43− window.styleMask = window.styleMask & ~NSTexturedBackgroundWindowMask;
44−- [window.contentView.superview setNeedsDisplay:YES];
45−+ [[window.contentView superview] setNeedsDisplay:YES];
46− window.titlebarAppearsTransparent = NO;
47− return;
48− }
49−diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm
50−index cb13b7d184..0159d68dca 100644
51−--- a/src/plugins/platforms/cocoa/qnswindow.mm
52−+++ b/src/plugins/platforms/cocoa/qnswindow.mm
53−@@ -231,7 +231,7 @@ static bool isMouseEvent(NSEvent *ev)
54− if (pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) {
55− NSPoint loc = [theEvent locationInWindow];
56− NSRect windowFrame = [self convertRectFromScreen:self.frame];
57−- NSRect contentFrame = self.contentView.frame;
58−+ NSRect contentFrame = [self.contentView frame];
59− if (NSMouseInRect(loc, windowFrame, NO) && !NSMouseInRect(loc, contentFrame, NO))
60− [qnsview_cast(pw->view()) handleFrameStrutMouseEvent:theEvent];
61− }
62−@@ -260,7 +260,7 @@ static bool isMouseEvent(NSEvent *ev)
63− + (void)applicationActivationChanged:(NSNotification*)notification
64− {
65− const id sender = self;
66−- NSEnumerator<NSWindow*> *windowEnumerator = nullptr;
67−+ NSEnumerator *windowEnumerator = nullptr;
68− NSApplication *application = [NSApplication sharedApplication];
69−
70− #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)
pkgs/development/libraries/qt-5/5.11/qtbase-revert-no-macos10.10.patchdeleted−102
@@ -1,102 +0,0 @@
1−Revert "Remove code paths for macOS < 10.11"
2−
3−This reverts commit 138a65e0cfa80b13fd018a01e7d8b33341a3cfd3.
4−
5−From 138a65e0cfa80b13fd018a01e7d8b33341a3cfd3 Mon Sep 17 00:00:00 2001
6−From: Jake Petroules <jake.petroules@qt.io>
7−Date: Thu, 8 Feb 2018 11:05:42 -0800
8−Subject: [PATCH] Remove code paths for macOS < 10.11
9−MIME-Version: 1.0
10−Content-Type: text/plain; charset=UTF-8
11−Content-Transfer-Encoding: 8bit
12−
13−Change-Id: I5ae02d88aa3dcd97d1f2ebf6255a68643e5d6daa
14−Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
15−Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
16−Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
17−---
18− .../fontdatabases/mac/qfontengine_coretext.mm | 16 +++-------------
19− src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm | 6 +-----
20− src/plugins/platforms/cocoa/qnswindowdelegate.mm | 16 ----------------
21− 3 files changed, 4 insertions(+), 34 deletions(-)
22−
23−diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
24−index 98b753eff9..489d9cd031 100644
25−--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
26−+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
27−@@ -47,18 +47,28 @@
28−
29− #include <cmath>
30−
31−-#if defined(Q_OS_MACOS)
32−+#if defined(Q_OS_OSX) && !QT_OSX_DEPLOYMENT_TARGET_BELOW(__MAC_10_11)
33− #import <AppKit/AppKit.h>
34− #endif
35−
36−-#if defined(QT_PLATFORM_UIKIT)
37−+#if defined(QT_PLATFORM_UIKIT) && !QT_IOS_DEPLOYMENT_TARGET_BELOW(__IPHONE_8_2)
38− #import <UIKit/UIKit.h>
39− #endif
40−
41− // These are available cross platform, exported as kCTFontWeightXXX from CoreText.framework,
42− // but they are not documented and are not in public headers so are private API and exposed
43− // only through the NSFontWeightXXX and UIFontWeightXXX aliases in AppKit and UIKit (rdar://26109857)
44−-#if defined(Q_OS_MACOS)
45−+#if QT_MAC_DEPLOYMENT_TARGET_BELOW(__MAC_10_11, __IPHONE_8_2)
46−+#define kCTFontWeightUltraLight -0.8
47−+#define kCTFontWeightThin -0.6
48−+#define kCTFontWeightLight -0.4
49−+#define kCTFontWeightRegular 0
50−+#define kCTFontWeightMedium 0.23
51−+#define kCTFontWeightSemibold 0.3
52−+#define kCTFontWeightBold 0.4
53−+#define kCTFontWeightHeavy 0.56
54−+#define kCTFontWeightBlack 0.62
55−+#elif defined(Q_OS_OSX)
56− #define kCTFontWeightUltraLight NSFontWeightUltraLight
57− #define kCTFontWeightThin NSFontWeightThin
58− #define kCTFontWeightLight NSFontWeightLight
59−diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
60−index 94f2125bad..272cd9f3dc 100644
61−--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
62−+++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
63−@@ -162,7 +162,11 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSOpenSavePanelDelegate);
64− // resetting our mCurrentDir, set the delegate
65− // here to make sure it gets the correct value.
66− [mSavePanel setDelegate:self];
67−- mOpenPanel.accessoryViewDisclosed = YES;
68−+
69−+#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_11)
70−+ if (__builtin_available(macOS 10.11, *))
71−+ mOpenPanel.accessoryViewDisclosed = YES;
72−+#endif
73−
74− if (mOptions->isLabelExplicitlySet(QFileDialogOptions::Accept))
75− [mSavePanel setPrompt:[self strip:options->labelText(QFileDialogOptions::Accept)]];
76−diff --git a/src/plugins/platforms/cocoa/qnswindowdelegate.mm b/src/plugins/platforms/cocoa/qnswindowdelegate.mm
77−index 057a4c2943..eb55e50622 100644
78−--- a/src/plugins/platforms/cocoa/qnswindowdelegate.mm
79−+++ b/src/plugins/platforms/cocoa/qnswindowdelegate.mm
80−@@ -103,6 +103,22 @@ static QRegExp whitespaceRegex = QRegExp(QStringLiteral("\\s*"));
81− return QCocoaScreen::mapToNative(maximizedFrame);
82− }
83−
84−+#if QT_MACOS_DEPLOYMENT_TARGET_BELOW(__MAC_10_11)
85−+/*
86−+ AppKit on OS X 10.10 wrongly calls windowWillUseStandardFrame:defaultFrame
87−+ from -[NSWindow _frameForFullScreenMode] when going into fullscreen, resulting
88−+ in black bars on top and bottom of the window. By implementing the following
89−+ method, AppKit will choose that instead, and resolve the right fullscreen
90−+ geometry.
91−+*/
92−+- (NSSize)window:(NSWindow *)window willUseFullScreenContentSize:(NSSize)proposedSize
93−+{
94−+ Q_UNUSED(proposedSize);
95−+ Q_ASSERT(window == m_cocoaWindow->nativeWindow());
96−+ return NSSizeFromCGSize(m_cocoaWindow->screen()->geometry().size().toCGSize());
97−+}
98−+#endif
99−+
100− - (BOOL)window:(NSWindow *)window shouldPopUpDocumentPathMenu:(NSMenu *)menu
101− {
102− Q_UNUSED(window);
pkgs/development/libraries/qt-5/5.11/qtwebengine-clang-fix.patchdeleted−30
@@ -1,30 +0,0 @@
1−Fix a following build error:
2−
3−In file included from ../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:7:
4−../../3rdparty/chromium/base/bind.h:59:3: error: static_assert failed "Bound argument |i| of type |Arg| cannot be forwarded as |Unwrapped| to the bound functor, which declares it as |Param|."
5− static_assert(
6− ^
7−../../3rdparty/chromium/base/bind.h:91:7: note: in instantiation of template class 'base::internal::AssertConstructible<1, long, long, const long &, NSError *>' requested here
8− : AssertConstructible<Ns, Args, std::decay_t<Args>, Unwrapped, Params>... {
9− ^
10−../../3rdparty/chromium/base/bind.h:213:27: note: in instantiation of template class 'base::internal::AssertBindArgsValidity<std::__1::integer_sequence<unsigned long, 0, 1>, base::internal::TypeList<base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, const long &>, base::internal::TypeList<device::BluetoothRemoteGattCharacteristicMac *, NSError *> >' requested here
11− static_assert(internal::AssertBindArgsValidity<
12− ^
13−../../3rdparty/chromium/base/bind.h:242:16: note: in instantiation of function template specialization 'base::BindRepeating<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here
14− return base::BindRepeating(std::forward<Functor>(functor),
15− ^
16−../../3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm:211:15: note: in instantiation of function template specialization 'base::Bind<void (device::BluetoothRemoteGattCharacteristicMac::*)(NSError *), base::WeakPtr<device::BluetoothRemoteGattCharacteristicMac>, long>' requested here
17− base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue,
18− ^
19−
20−--- a/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
21−+++ b/src/3rdparty/chromium/device/bluetooth/bluetooth_remote_gatt_characteristic_mac.mm
22−@@ -209,7 +209,7 @@ void BluetoothRemoteGattCharacteristicMac::WriteRemoteCharacteristic(
23− base::ThreadTaskRunnerHandle::Get()->PostTask(
24− FROM_HERE,
25− base::Bind(&BluetoothRemoteGattCharacteristicMac::DidWriteValue,
26−- weak_ptr_factory_.GetWeakPtr(), nil));
27−+ weak_ptr_factory_.GetWeakPtr(), nullptr));
28− }
29− }
30−
pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-old-sdk.patchdeleted−21
@@ -1,21 +0,0 @@
1−diff --git a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm
2−--- a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm
3−+++ b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Classes/Common/RTCFieldTrials.mm
4−@@ -45,7 +45,7 @@ NSString *RTCFieldTrialTrendlineFilterValue(
5− return [NSString stringWithFormat:format, windowSize, smoothingCoeff, thresholdGain];
6− }
7−
8−-void RTCInitFieldTrialDictionary(NSDictionary<NSString *, NSString *> *fieldTrials) {
9−+void RTCInitFieldTrialDictionary(NSDictionary *fieldTrials) {
10− if (!fieldTrials) {
11− RTCLogWarning(@"No fieldTrials provided.");
12− return;
13−diff --git a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h
14−--- a/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h
15−+++ b/src/3rdparty/chromium/third_party/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCFieldTrials.h
16−@@ -40,4 +40,4 @@ RTC_EXTERN NSString *RTCFieldTrialTrendlineFilterValue(
17− * Must be called before any other call into WebRTC. See:
18− * webrtc/system_wrappers/include/field_trial_default.h
19− */
20−-RTC_EXTERN void RTCInitFieldTrialDictionary(NSDictionary<NSString *, NSString *> *fieldTrials);
21−+RTC_EXTERN void RTCInitFieldTrialDictionary(NSDictionary *fieldTrials);
pkgs/development/libraries/qt-5/5.11/qtwebengine-darwin-sdk-10.10.patchdeleted−160
@@ -1,160 +0,0 @@
1−Fix build against 10.10 SDK
2−
3−The SecKey part perhaps could be fixed by implementing a revert to
4−https://chromium.googlesource.com/chromium/src.git/+/8418e098b9cbedf884878b61dcd3292c515845cf%5E%21/#F0
5−
6−--- a/src/3rdparty/chromium/content/browser/renderer_host/input/web_input_event_builders_mac.mm
7−+++ b/src/3rdparty/chromium/content/browser/renderer_host/input/web_input_event_builders_mac.mm
8−@@ -1,3 +1,4 @@
9−+#define NSEventTypeScrollWheel 22
10− // Copyright 2015 The Chromium Authors. All rights reserved.
11− // Use of this source code is governed by a BSD-style license that can be
12− // found in the LICENSE file.
13−--- a/src/3rdparty/chromium/net/ssl/ssl_platform_key_mac.cc
14−+++ b/src/3rdparty/chromium/net/ssl/ssl_platform_key_mac.cc
15−@@ -48,21 +48,6 @@ namespace net {
16−
17− namespace {
18−
19−-// TODO(davidben): Remove this when we switch to building to the 10.13
20−-// SDK. https://crbug.com/780980
21−-#if !defined(MAC_OS_X_VERSION_10_13) || \
22−- MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_13
23−-API_AVAILABLE(macosx(10.13))
24−-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA256 =
25−- CFSTR("algid:sign:RSA:digest-PSS:SHA256:SHA256:32");
26−-API_AVAILABLE(macosx(10.13))
27−-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA384 =
28−- CFSTR("algid:sign:RSA:digest-PSS:SHA384:SHA384:48");
29−-API_AVAILABLE(macosx(10.13))
30−-const SecKeyAlgorithm kSecKeyAlgorithmRSASignatureDigestPSSSHA512 =
31−- CFSTR("algid:sign:RSA:digest-PSS:SHA512:SHA512:64");
32−-#endif
33−-
34− class ScopedCSSM_CC_HANDLE {
35− public:
36− ScopedCSSM_CC_HANDLE() : handle_(0) {}
37−@@ -187,109 +172,6 @@ class SSLPlatformKeyCSSM : public ThreadedSSLPrivateKey::Delegate {
38− DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyCSSM);
39− };
40−
41−-// Returns the corresponding SecKeyAlgorithm or nullptr if unrecognized.
42−-API_AVAILABLE(macosx(10.12))
43−-SecKeyAlgorithm GetSecKeyAlgorithm(uint16_t algorithm) {
44−- switch (algorithm) {
45−- case SSL_SIGN_RSA_PKCS1_SHA512:
46−- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA512;
47−- case SSL_SIGN_RSA_PKCS1_SHA384:
48−- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA384;
49−- case SSL_SIGN_RSA_PKCS1_SHA256:
50−- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA256;
51−- case SSL_SIGN_RSA_PKCS1_SHA1:
52−- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15SHA1;
53−- case SSL_SIGN_RSA_PKCS1_MD5_SHA1:
54−- return kSecKeyAlgorithmRSASignatureDigestPKCS1v15Raw;
55−- case SSL_SIGN_ECDSA_SECP521R1_SHA512:
56−- return kSecKeyAlgorithmECDSASignatureDigestX962SHA512;
57−- case SSL_SIGN_ECDSA_SECP384R1_SHA384:
58−- return kSecKeyAlgorithmECDSASignatureDigestX962SHA384;
59−- case SSL_SIGN_ECDSA_SECP256R1_SHA256:
60−- return kSecKeyAlgorithmECDSASignatureDigestX962SHA256;
61−- case SSL_SIGN_ECDSA_SHA1:
62−- return kSecKeyAlgorithmECDSASignatureDigestX962SHA1;
63−- }
64−-
65−- if (base::mac::IsAtLeastOS10_13()) {
66−- switch (algorithm) {
67−- case SSL_SIGN_RSA_PSS_SHA512:
68−- return kSecKeyAlgorithmRSASignatureDigestPSSSHA512;
69−- case SSL_SIGN_RSA_PSS_SHA384:
70−- return kSecKeyAlgorithmRSASignatureDigestPSSSHA384;
71−- case SSL_SIGN_RSA_PSS_SHA256:
72−- return kSecKeyAlgorithmRSASignatureDigestPSSSHA256;
73−- }
74−- }
75−-
76−- return nullptr;
77−-}
78−-
79−-class API_AVAILABLE(macosx(10.12)) SSLPlatformKeySecKey
80−- : public ThreadedSSLPrivateKey::Delegate {
81−- public:
82−- SSLPlatformKeySecKey(int type, size_t max_length, SecKeyRef key)
83−- : key_(key, base::scoped_policy::RETAIN) {
84−- // Determine the algorithms supported by the key.
85−- for (uint16_t algorithm : SSLPrivateKey::DefaultAlgorithmPreferences(
86−- type, true /* include PSS */)) {
87−- SecKeyAlgorithm sec_algorithm = GetSecKeyAlgorithm(algorithm);
88−- if (sec_algorithm &&
89−- SecKeyIsAlgorithmSupported(key_.get(), kSecKeyOperationTypeSign,
90−- sec_algorithm)) {
91−- preferences_.push_back(algorithm);
92−- }
93−- }
94−- }
95−-
96−- ~SSLPlatformKeySecKey() override {}
97−-
98−- std::vector<uint16_t> GetAlgorithmPreferences() override {
99−- return preferences_;
100−- }
101−-
102−- Error Sign(uint16_t algorithm,
103−- base::span<const uint8_t> input,
104−- std::vector<uint8_t>* signature) override {
105−- SecKeyAlgorithm sec_algorithm = GetSecKeyAlgorithm(algorithm);
106−- if (!sec_algorithm) {
107−- NOTREACHED();
108−- return ERR_FAILED;
109−- }
110−-
111−- const EVP_MD* md = SSL_get_signature_algorithm_digest(algorithm);
112−- uint8_t digest[EVP_MAX_MD_SIZE];
113−- unsigned digest_len;
114−- if (!md || !EVP_Digest(input.data(), input.size(), digest, &digest_len, md,
115−- nullptr)) {
116−- return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED;
117−- }
118−-
119−- base::ScopedCFTypeRef<CFDataRef> digest_ref(CFDataCreateWithBytesNoCopy(
120−- kCFAllocatorDefault, digest, base::checked_cast<CFIndex>(digest_len),
121−- kCFAllocatorNull));
122−-
123−- base::ScopedCFTypeRef<CFErrorRef> error;
124−- base::ScopedCFTypeRef<CFDataRef> signature_ref(SecKeyCreateSignature(
125−- key_, sec_algorithm, digest_ref, error.InitializeInto()));
126−- if (!signature_ref) {
127−- LOG(ERROR) << error;
128−- return ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED;
129−- }
130−-
131−- signature->assign(
132−- CFDataGetBytePtr(signature_ref),
133−- CFDataGetBytePtr(signature_ref) + CFDataGetLength(signature_ref));
134−- return OK;
135−- }
136−-
137−- private:
138−- std::vector<uint16_t> preferences_;
139−- base::ScopedCFTypeRef<SecKeyRef> key_;
140−-
141−- DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeySecKey);
142−-};
143−-
144− scoped_refptr<SSLPrivateKey> CreateSSLPrivateKeyForSecKey(
145− const X509Certificate* certificate,
146− SecKeyRef private_key) {
147−@@ -298,13 +180,6 @@ scoped_refptr<SSLPrivateKey> CreateSSLPrivateKeyForSecKey(
148− if (!GetClientCertInfo(certificate, &key_type, &max_length))
149− return nullptr;
150−
151−- if (base::mac::IsAtLeastOS10_12()) {
152−- return base::MakeRefCounted<ThreadedSSLPrivateKey>(
153−- std::make_unique<SSLPlatformKeySecKey>(key_type, max_length,
154−- private_key),
155−- GetSSLPlatformKeyTaskRunner());
156−- }
157−-
158− const CSSM_KEY* cssm_key;
159− OSStatus status = SecKeyGetCSSMKey(private_key, &cssm_key);
160− if (status != noErr) {
pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-qos-classes.patchdeleted−11
@@ -1,11 +0,0 @@
1−diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake
2−--- a/Source/cmake/OptionsQt.cmake
3−+++ b/Source/cmake/OptionsQt.cmake
4−@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG)
5− endif ()
6−
7− if (APPLE)
8−- SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1)
9− endif ()
10−
11− if (ENABLE_MATHML)
pkgs/development/libraries/qt-5/5.11/qtwebkit-darwin-no-readline.patchdeleted−45
@@ -1,45 +0,0 @@
1−diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
2−--- a/Source/JavaScriptCore/shell/CMakeLists.txt
3−+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
4−@@ -9,7 +9,6 @@ set(JSC_LIBRARIES
5− )
6−
7− if (WTF_OS_MAC_OS_X)
8−- list(APPEND JSC_LIBRARIES edit)
9− endif ()
10−
11− if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC")
12−diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
13−--- a/Source/WTF/wtf/Platform.h
14−+++ b/Source/WTF/wtf/Platform.h
15−@@ -563,7 +563,6 @@
16− #if PLATFORM(IOS)
17−
18− #define HAVE_NETWORK_EXTENSION 1
19−-#define HAVE_READLINE 1
20− #if USE(APPLE_INTERNAL_SDK)
21− #define USE_CFNETWORK 1
22− #endif
23−@@ -650,7 +649,6 @@
24− #define HAVE_MADV_DONTNEED 1
25− #define HAVE_MERGESORT 1
26− #define HAVE_PTHREAD_SETNAME_NP 1
27−-#define HAVE_READLINE 1
28− #define HAVE_SYS_TIMEB_H 1
29−
30− #if !PLATFORM(GTK) && !PLATFORM(QT)
31−diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake
32−--- a/Source/WTF/wtf/PlatformMac.cmake
33−+++ b/Source/WTF/wtf/PlatformMac.cmake
34−@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED)
35−
36− find_library(COCOA_LIBRARY Cocoa)
37− find_library(COREFOUNDATION_LIBRARY CoreFoundation)
38−-find_library(READLINE_LIBRARY Readline)
39− list(APPEND WTF_LIBRARIES
40− ${COREFOUNDATION_LIBRARY}
41− ${COCOA_LIBRARY}
42−- ${READLINE_LIBRARY}
43− libicucore.dylib
44− )
45−
pkgs/development/libraries/qt-5/5.12/default.nix+5−7
@@ -20,7 +20,7 @@ top-level attribute to `top-level/all-packages.nix`.
2020 stdenv, fetchurl, fetchFromGitHub, makeSetupHook,
2121 bison, cups ? null, harfbuzz, libGL, perl,
2222 gstreamer, gst-plugins-base, gtk3, dconf,
23− cf-private,
23+ cf-private, llvmPackages_5,
2424
2525 # options
2626 developerBuild ? false,
@@ -51,11 +51,7 @@ let
5151 patches = {
5252 qtbase = [
5353 ./qtbase.patch
54− ./qtbase-darwin.patch
55− ./qtbase-revert-no-macos10.10.patch
5654 ./qtbase-fixguicmake.patch
57− ] ++ optionals stdenv.isDarwin [
58− ./qtbase-darwin-nseventtype.patch
5955 ];
6056 qtdeclarative = [ ./qtdeclarative.patch ];
6157 qtscript = [ ./qtscript.patch ];
@@ -73,8 +69,10 @@ let
7369 };
7470
7571 mkDerivation =
76− import ../mkDerivation.nix
77− { inherit stdenv; inherit (stdenv) lib; }
72+ import ../mkDerivation.nix {
73+ inherit (stdenv) lib;
74+ stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
75+ }
7876 { inherit debug; };
7977
8078 qtModule =
pkgs/development/libraries/qt-5/5.12/qtbase-darwin-nseventtype.patchdeleted−13
@@ -1,13 +0,0 @@
1−--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
2−+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
3−@@ -404,8 +404,8 @@ void QCocoaWindow::setVisible(bool visible)
4− removeMonitor();
5− monitor = [NSEvent addGlobalMonitorForEventsMatchingMask:NSLeftMouseDownMask|NSRightMouseDownMask|NSOtherMouseDownMask|NSMouseMovedMask handler:^(NSEvent *e) {
6− QPointF localPoint = QCocoaScreen::mapFromNative([NSEvent mouseLocation]);
7−- const auto button = e.type == NSEventTypeMouseMoved ? Qt::NoButton : cocoaButton2QtButton([e buttonNumber]);
8−- const auto eventType = e.type == NSEventTypeMouseMoved ? QEvent::MouseMove : QEvent::MouseButtonPress;
9−+ const auto button = e.type == NSMouseMoved ? Qt::NoButton : cocoaButton2QtButton([e buttonNumber]);
10−+ const auto eventType = e.type == NSMouseMoved ? QEvent::MouseMove : QEvent::MouseButtonPress;
11− QWindowSystemInterface::handleMouseEvent(window(), window()->mapFromGlobal(localPoint.toPoint()), localPoint,
12− Qt::MouseButtons(uint(NSEvent.pressedMouseButtons & 0xFFFF)), button, eventType);
13− }];
pkgs/development/libraries/qt-5/5.12/qtbase-darwin.patchdeleted−70
@@ -1,70 +0,0 @@
1−diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
2−index c3dd49ff3e..6871399817 100644
3−--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
4−+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
5−@@ -283,7 +283,7 @@ void QScanThread::getUserConfigurations()
6− QMacAutoReleasePool pool;
7− userProfiles.clear();
8−
9−- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
10−+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
11− for (NSString *ifName in wifiInterfaces) {
12−
13− CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName];
14−@@ -598,7 +598,7 @@ void QCoreWlanEngine::doRequestUpdate()
15−
16− QMacAutoReleasePool pool;
17−
18−- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
19−+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
20− for (NSString *ifName in wifiInterfaces) {
21− scanThread->interfaceName = QString::fromNSString(ifName);
22− scanThread->start();
23−diff --git a/src/plugins/platforms/cocoa/qcocoascreen.mm b/src/plugins/platforms/cocoa/qcocoascreen.mm
24−index afe14e623c..74d69c2fa1 100644
25−--- a/src/plugins/platforms/cocoa/qcocoascreen.mm
26−+++ b/src/plugins/platforms/cocoa/qcocoascreen.mm
27−@@ -127,7 +127,7 @@ void QCocoaScreen::updateProperties()
28− const qreal previousRefreshRate = m_refreshRate;
29−
30− // The reference screen for the geometry is always the primary screen
31−- QRectF primaryScreenGeometry = QRectF::fromCGRect([[NSScreen screens] firstObject].frame);
32−+ QRectF primaryScreenGeometry = QRectF::fromCGRect([[[NSScreen screens] firstObject] frame]);
33− m_geometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.frame), primaryScreenGeometry).toRect();
34− m_availableGeometry = qt_mac_flip(QRectF::fromCGRect(nsScreen.visibleFrame), primaryScreenGeometry).toRect();
35−
36−diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
37−index df1ad82592..0318a4ff96 100644
38−--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
39−+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
40−@@ -1704,7 +1704,7 @@ void QCocoaWindow::applyContentBorderThickness(NSWindow *window)
41−
42− if (!m_drawContentBorderGradient) {
43− window.styleMask = window.styleMask & ~NSWindowStyleMaskTexturedBackground;
44−- [window.contentView.superview setNeedsDisplay:YES];
45−+ [[window.contentView superview] setNeedsDisplay:YES];
46− window.titlebarAppearsTransparent = NO;
47− return;
48− }
49−diff --git a/src/plugins/platforms/cocoa/qnswindow.mm b/src/plugins/platforms/cocoa/qnswindow.mm
50−index c17ad47aba..a0f1dd38fb 100644
51−--- a/src/plugins/platforms/cocoa/qnswindow.mm
52−+++ b/src/plugins/platforms/cocoa/qnswindow.mm
53−@@ -230,7 +230,7 @@ static bool isMouseEvent(NSEvent *ev)
54− if (pw->frameStrutEventsEnabled() && isMouseEvent(theEvent)) {
55− NSPoint loc = [theEvent locationInWindow];
56− NSRect windowFrame = [self convertRectFromScreen:self.frame];
57−- NSRect contentFrame = self.contentView.frame;
58−+ NSRect contentFrame = [self.contentView frame];
59− if (NSMouseInRect(loc, windowFrame, NO) && !NSMouseInRect(loc, contentFrame, NO))
60− [qnsview_cast(pw->view()) handleFrameStrutMouseEvent:theEvent];
61− }
62−@@ -257,7 +257,7 @@ static bool isMouseEvent(NSEvent *ev)
63− + (void)applicationActivationChanged:(NSNotification*)notification
64− {
65− const id sender = self;
66−- NSEnumerator<NSWindow*> *windowEnumerator = nullptr;
67−+ NSEnumerator *windowEnumerator = nullptr;
68− NSApplication *application = [NSApplication sharedApplication];
69−
70− // Unfortunately there's no NSWindowListOrderedBackToFront,
pkgs/development/libraries/qt-5/5.12/qtbase-revert-no-macos10.10.patchdeleted−102
@@ -1,102 +0,0 @@
1−Revert "Remove code paths for macOS < 10.11"
2−
3−This reverts commit 138a65e0cfa80b13fd018a01e7d8b33341a3cfd3.
4−
5−From 138a65e0cfa80b13fd018a01e7d8b33341a3cfd3 Mon Sep 17 00:00:00 2001
6−From: Jake Petroules <jake.petroules@qt.io>
7−Date: Thu, 8 Feb 2018 11:05:42 -0800
8−Subject: [PATCH] Remove code paths for macOS < 10.11
9−MIME-Version: 1.0
10−Content-Type: text/plain; charset=UTF-8
11−Content-Transfer-Encoding: 8bit
12−
13−Change-Id: I5ae02d88aa3dcd97d1f2ebf6255a68643e5d6daa
14−Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
15−Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
16−Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
17−---
18− .../fontdatabases/mac/qfontengine_coretext.mm | 16 +++-------------
19− src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm | 6 +-----
20− src/plugins/platforms/cocoa/qnswindowdelegate.mm | 16 ----------------
21− 3 files changed, 4 insertions(+), 34 deletions(-)
22−
23−diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
24−index 98b753eff9..489d9cd031 100644
25−--- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
26−+++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
27−@@ -47,18 +47,28 @@
28−
29− #include <cmath>
30−
31−-#if defined(Q_OS_MACOS)
32−+#if defined(Q_OS_OSX) && !QT_OSX_DEPLOYMENT_TARGET_BELOW(__MAC_10_11)
33− #import <AppKit/AppKit.h>
34− #endif
35−
36−-#if defined(QT_PLATFORM_UIKIT)
37−+#if defined(QT_PLATFORM_UIKIT) && !QT_IOS_DEPLOYMENT_TARGET_BELOW(__IPHONE_8_2)
38− #import <UIKit/UIKit.h>
39− #endif
40−
41− // These are available cross platform, exported as kCTFontWeightXXX from CoreText.framework,
42− // but they are not documented and are not in public headers so are private API and exposed
43− // only through the NSFontWeightXXX and UIFontWeightXXX aliases in AppKit and UIKit (rdar://26109857)
44−-#if defined(Q_OS_MACOS)
45−+#if QT_MAC_DEPLOYMENT_TARGET_BELOW(__MAC_10_11, __IPHONE_8_2)
46−+#define kCTFontWeightUltraLight -0.8
47−+#define kCTFontWeightThin -0.6
48−+#define kCTFontWeightLight -0.4
49−+#define kCTFontWeightRegular 0
50−+#define kCTFontWeightMedium 0.23
51−+#define kCTFontWeightSemibold 0.3
52−+#define kCTFontWeightBold 0.4
53−+#define kCTFontWeightHeavy 0.56
54−+#define kCTFontWeightBlack 0.62
55−+#elif defined(Q_OS_OSX)
56− #define kCTFontWeightUltraLight NSFontWeightUltraLight
57− #define kCTFontWeightThin NSFontWeightThin
58− #define kCTFontWeightLight NSFontWeightLight
59−diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
60−index 94f2125bad..272cd9f3dc 100644
61−--- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
62−+++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm
63−@@ -162,7 +162,11 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSOpenSavePanelDelegate);
64− // resetting our mCurrentDir, set the delegate
65− // here to make sure it gets the correct value.
66− [mSavePanel setDelegate:self];
67−- mOpenPanel.accessoryViewDisclosed = YES;
68−+
69−+#if QT_OSX_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_11)
70−+ if (__builtin_available(macOS 10.11, *))
71−+ mOpenPanel.accessoryViewDisclosed = YES;
72−+#endif
73−
74− if (mOptions->isLabelExplicitlySet(QFileDialogOptions::Accept))
75− [mSavePanel setPrompt:[self strip:options->labelText(QFileDialogOptions::Accept)]];
76−diff --git a/src/plugins/platforms/cocoa/qnswindowdelegate.mm b/src/plugins/platforms/cocoa/qnswindowdelegate.mm
77−index 057a4c2943..eb55e50622 100644
78−--- a/src/plugins/platforms/cocoa/qnswindowdelegate.mm
79−+++ b/src/plugins/platforms/cocoa/qnswindowdelegate.mm
80−@@ -103,6 +103,22 @@ static QRegExp whitespaceRegex = QRegExp(QStringLiteral("\\s*"));
81− return QCocoaScreen::mapToNative(maximizedFrame);
82− }
83−
84−+#if QT_MACOS_DEPLOYMENT_TARGET_BELOW(__MAC_10_11)
85−+/*
86−+ AppKit on OS X 10.10 wrongly calls windowWillUseStandardFrame:defaultFrame
87−+ from -[NSWindow _frameForFullScreenMode] when going into fullscreen, resulting
88−+ in black bars on top and bottom of the window. By implementing the following
89−+ method, AppKit will choose that instead, and resolve the right fullscreen
90−+ geometry.
91−+*/
92−+- (NSSize)window:(NSWindow *)window willUseFullScreenContentSize:(NSSize)proposedSize
93−+{
94−+ Q_UNUSED(proposedSize);
95−+ Q_ASSERT(window == m_cocoaWindow->nativeWindow());
96−+ return NSSizeFromCGSize(m_cocoaWindow->screen()->geometry().size().toCGSize());
97−+}
98−+#endif
99−+
100− - (BOOL)window:(NSWindow *)window shouldPopUpDocumentPathMenu:(NSMenu *)menu
101− {
102− Q_UNUSED(window);
pkgs/development/libraries/qt-5/5.9/default.nix+1−1
@@ -38,7 +38,7 @@ let
3838 srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
3939
4040 patches = {
41− qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch ] ++ optional stdenv.isDarwin ./qtbase-darwin.patch;
41+ qtbase = [ ./qtbase.patch ./qtbase-fixguicmake.patch ];
4242 qtdeclarative = [ ./qtdeclarative.patch ];
4343 qtscript = [ ./qtscript.patch ];
4444 qtserialport = [ ./qtserialport.patch ];
pkgs/development/libraries/qt-5/5.9/qtbase-darwin.patchdeleted−35
@@ -1,35 +0,0 @@
1−diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
2−index 341d3bc..3368234 100644
3−--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
4−+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
5−@@ -287,7 +287,7 @@ void QScanThread::getUserConfigurations()
6− QMacAutoReleasePool pool;
7− userProfiles.clear();
8−
9−- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
10−+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
11− for (NSString *ifName in wifiInterfaces) {
12−
13− CWInterface *wifiInterface = [[CWWiFiClient sharedWiFiClient] interfaceWithName:ifName];
14−@@ -602,7 +602,7 @@ void QCoreWlanEngine::doRequestUpdate()
15−
16− QMacAutoReleasePool pool;
17−
18−- NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
19−+ NSArray *wifiInterfaces = [CWWiFiClient interfaceNames];
20− for (NSString *ifName in wifiInterfaces) {
21− scanThread->interfaceName = QString::fromNSString(ifName);
22− scanThread->start();
23−diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
24−index 5cd4beb..84919e6 100644
25−--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
26−+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
27−@@ -320,7 +320,7 @@ static void qt_closePopups()
28− + (void)applicationActivationChanged:(NSNotification*)notification
29− {
30− const id sender = self;
31−- NSEnumerator<NSWindow*> *windowEnumerator = nullptr;
32−+ NSEnumerator *windowEnumerator = nullptr;
33− NSApplication *application = [NSApplication sharedApplication];
34−
35− #if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_12)
pkgs/development/libraries/qt-5/modules/qtbase.nix+10−26
@@ -2,7 +2,7 @@
22 stdenv, lib,
33 src, patches, version, qtCompatVersion,
44
5− coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2,
5+ coreutils, bison, flex, gdb, gperf, lndir, perl, pkgconfig, python2,
66 which,
77 # darwin support
88 darwin, libiconv,
@@ -78,17 +78,15 @@ stdenv.mkDerivation {
7878 [ libinput ]
7979 ++ lib.optional withGtk3 gtk3
8080 )
81− ++ lib.optional stdenv.isDarwin
82− # Needed for OBJC_CLASS_$_NSDate symbols.
83− [ darwin.cf-private ]
81+ # Needed for OBJC_CLASS_$_NSDate symbols.
82+ ++ lib.optional stdenv.isDarwin darwin.cf-private
8483 ++ lib.optional developerBuild gdb
8584 ++ lib.optional (cups != null) cups
8685 ++ lib.optional (mysql != null) mysql.connector-c
8786 ++ lib.optional (postgresql != null) postgresql;
8887
8988 nativeBuildInputs =
90− [ bison flex gperf lndir perl pkgconfig python2 which ]
91− ++ lib.optional (!stdenv.isDarwin) patchelf;
89+ [ bison flex gperf lndir perl pkgconfig python2 which ];
9290
9391 propagatedNativeBuildInputs = [ lndir ];
9492
@@ -199,26 +197,11 @@ stdenv.mkDerivation {
199197 ''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
200198 ]
201199
202− ++ (
203− if stdenv.isDarwin
204− then
205− [
206− "-Wno-missing-sysroot"
207− "-D__MAC_OS_X_VERSION_MAX_ALLOWED=1090"
208− "-D__AVAILABILITY_INTERNAL__MAC_10_10=__attribute__((availability(macosx,introduced=10.10)))"
209− # Note that nixpkgs's objc4 is from macOS 10.11 while the SDK is
210− # 10.9 which necessitates the above macro definition that mentions
211− # 10.10
212− ]
213− else
214− lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
215− ++ lib.optionals withGtk3
216− [
217− ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
218− ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
219− ]
220− )
221−
200+ ++ lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"''
201+ ++ lib.optionals withGtk3 [
202+ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
203+ ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
204+ ]
222205 ++ lib.optional decryptSslTraffic "-DQT_DECRYPT_SSL_TRAFFIC";
223206
224207 prefixKey = "-prefix ";
@@ -395,6 +378,7 @@ stdenv.mkDerivation {
395378 license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
396379 maintainers = with maintainers; [ qknight ttuegel periklis bkchr ];
397380 platforms = platforms.unix;
381+ broken = stdenv.isDarwin && (compareVersion "5.9.0" < 0);
398382 };
399383
400384}
pkgs/development/libraries/qt-5/modules/qtwebengine.nix+1−1
@@ -79,7 +79,7 @@ qtModule {
7979 cat <<EOF > src/3rdparty/chromium/build/mac/find_sdk.py
8080#!/usr/bin/env python
8181print("${darwin.apple_sdk.sdk}")
82−print("10.10.0")
82+print("10.12.0")
8383EOF
8484
8585 cat <<EOF > src/3rdparty/chromium/build/config/mac/sdk_info.py
pkgs/development/libraries/science/math/fenics/default.nix+7−2
@@ -35,10 +35,15 @@ let
3535 url = "https://bitbucket.org/fenics-project/dijitso/downloads/dijitso-${version}.tar.gz";
3636 sha256 = "0mw6mynjmg6yl3l2k33yra2x84s4r6mh44ylhk9znjfk74jra8zg";
3737 };
38− buildInputs = [ numpy pytest six ];
39− checkPhase = ''
38+ buildInputs = [ numpy six ];
39+ nativeBuildInputs = [ pytest ];
40+ preCheck = ''
4041 export HOME=$PWD
42+ '';
43+ checkPhase = ''
44+ runHook preCheck
4145 py.test test/
46+ runHook postCheck
4247 '';
4348 meta = {
4449 description = "Distributed just-in-time shared library building";
pkgs/development/libraries/science/math/openblas/default.nix+1
@@ -58,6 +58,7 @@ let
5858 BINARY = 64;
5959 TARGET = setTarget "ATHLON";
6060 DYNAMIC_ARCH = true;
61+ NO_AVX512 = true;
6162 USE_OPENMP = true;
6263 };
6364 };
pkgs/development/libraries/sqlite/analyzer.nix+3−3
@@ -6,11 +6,11 @@ in
66
77stdenv.mkDerivation rec {
88 name = "sqlite-analyzer-${version}";
9− version = "3.27.2";
9+ version = "3.28.0";
1010
1111 src = assert version == sqlite.version; fetchurl {
1212 url = "https://sqlite.org/2019/sqlite-src-${archiveVersion version}.zip";
13− sha256 = "02nz1y22wyb8101d9y6wfdrvp855wvch67js12p5y3riya345g8m";
13+ sha256 = "15v57b113bpgcshfsx5jw93szar3da94rr03i053xhl15la7jllh";
1414 };
1515
1616 nativeBuildInputs = [ unzip ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
2323 meta = with stdenv.lib; {
2424 description = "A tool that shows statistics about SQLite databases";
2525 downloadPage = http://sqlite.org/download.html;
26− homepage = http://www.sqlite.org;
26+ homepage = https://www.sqlite.org;
2727 license = licenses.publicDomain;
2828 maintainers = with maintainers; [ pesterhazy ];
2929 platforms = platforms.unix;
pkgs/development/libraries/sqlite/default.nix+4−4
@@ -10,12 +10,12 @@ in
1010
1111stdenv.mkDerivation rec {
1212 name = "sqlite-${version}";
13− version = "3.27.2";
13+ version = "3.28.0";
1414
1515 # NB! Make sure to update analyzer.nix src (in the same directory).
1616 src = fetchurl {
1717 url = "https://sqlite.org/2019/sqlite-autoconf-${archiveVersion version}.tar.gz";
18− sha256 = "0vpgwszs19pwks2b4dhqwa0n6q5sx6pn1s7rngyyrd98xa2rxhsh";
18+ sha256 = "1hxpi45crbqp6lacl7z611lna02k956m9bsy2bjzrbb2y23546yn";
1919 };
2020
2121 outputs = [ "bin" "dev" "out" ];
@@ -75,8 +75,8 @@ stdenv.mkDerivation rec {
7575
7676 meta = {
7777 description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
78− downloadPage = http://sqlite.org/download.html;
79− homepage = http://www.sqlite.org/;
78+ downloadPage = https://sqlite.org/download.html;
79+ homepage = https://www.sqlite.org/;
8080 license = licenses.publicDomain;
8181 maintainers = with maintainers; [ eelco np ];
8282 platforms = platforms.unix ++ platforms.windows;
pkgs/development/libraries/tk/8.6.nix+2−2
@@ -3,8 +3,8 @@
33callPackage ./generic.nix (args // rec {
44
55 src = fetchurl {
6− url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
7− sha256 = "17diivcfcwdhp4v5zi6j9nkxncccjqkivhp363c4wx5lf4d3fb6n";
6+ url = "mirror://sourceforge/tcl/tk${tcl.version}.1-src.tar.gz"; # TODO: remove '.1' for v8.6.10 or v8.7.x
7+ sha256 = "1d7bfkxpacy33w5nahf73lkwxqpff44w1jplg7i2gmwgiaawvjwg";
88 };
99
1010 patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ];
pkgs/development/libraries/tk/generic.nix+7−4
@@ -19,16 +19,19 @@ stdenv.mkDerivation {
1919 postInstall = ''
2020 ln -s $out/bin/wish* $out/bin/wish
2121 cp ../{unix,generic}/*.h $out/include
22+ ln -s $out/lib/libtk${tcl.release}.so $out/lib/libtk.so
2223 '';
2324
2425 configureFlags = [
26+ "--enable-threads"
2527 "--with-tcl=${tcl}/lib"
26− ] ++ stdenv.lib.optional enableAqua "--enable-aqua";
28+ ] ++ stdenv.lib.optional stdenv.is64bit "--enable-64bit"
29+ ++ stdenv.lib.optional enableAqua "--enable-aqua";
2730
2831 nativeBuildInputs = [ pkgconfig ];
2932
30− propagatedBuildInputs = [ tcl libXft ];
31− buildInputs = lib.optional enableAqua (with darwin; with apple_sdk.frameworks; [
33+ propagatedBuildInputs = [ tcl libXft ]
34+ ++ lib.optional enableAqua (with darwin; with apple_sdk.frameworks; [
3235 Cocoa cf-private
3336 ]);
3437
@@ -44,7 +47,7 @@ stdenv.mkDerivation {
4447
4548 meta = with stdenv.lib; {
4649 description = "A widget toolkit that provides a library of basic elements for building a GUI in many different programming languages";
47− homepage = http://www.tcl.tk/;
50+ homepage = https://www.tcl.tk/;
4851 license = licenses.tcltk;
4952 platforms = platforms.all;
5053 maintainers = with maintainers; [ lovek323 vrthra ];
pkgs/development/libraries/wxwidgets/2.9/default.nix+2−1
@@ -74,12 +74,13 @@ stdenv.mkDerivation {
7474 };
7575
7676 enableParallelBuilding = true;
77−
77+
7878 meta = {
7979 platforms = with platforms; darwin ++ linux;
8080 license = licenses.wxWindows;
8181 homepage = https://www.wxwidgets.org/;
8282 description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
8383 longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
84+ badPlatforms = [ "x86_64-darwin" ];
8485 };
8586}
pkgs/development/libraries/wxwidgets/3.0/default.nix+1
@@ -89,5 +89,6 @@ stdenv.mkDerivation rec {
8989 homepage = https://www.wxwidgets.org/;
9090 description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
9191 longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
92+ badPlatforms = [ "x86_64-darwin" ];
9293 };
9394}
pkgs/development/libraries/wxwidgets/3.0/mac.nix+1
@@ -71,5 +71,6 @@ stdenv.mkDerivation rec {
7171 homepage = https://www.wxwidgets.org/;
7272 description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base";
7373 longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more.";
74+ broken = true;
7475 };
7576}
pkgs/development/python-modules/Wand/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "Wand";
9− version = "0.5.2";
9+ version = "0.5.3";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "0nvdq15gmkzhwpwkln8wmkq0h4izznnr6zmrnwqza8lsa1c0jz5f";
13+ sha256 = "a2c318993791fab4fcfd460045415176f81d42f8c6fd8a88fb8d74d2f0f34b97";
1414 };
1515
1616 postPatch = ''
pkgs/development/python-modules/ansible-runner/default.nix+2−2
@@ -13,11 +13,11 @@
1313
1414buildPythonPackage rec {
1515 pname = "ansible-runner";
16− version = "1.3.2";
16+ version = "1.3.3";
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "6e4d8256351228c00fe68697e7f5ad2a2e0fd4085084b913eda22735023bb891";
20+ sha256 = "2a2b83e63b830de3ff01c2992342cfe09f96e410953c85904ee7e301b21fa513";
2121 };
2222
2323 checkInputs = [ pytest mock ];
pkgs/development/python-modules/asyncssh/default.nix+28−8
@@ -1,18 +1,35 @@
1−{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
1+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch
22, cryptography
33, bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl
4−, openssl }:
4+, openssl, openssh }:
55
66buildPythonPackage rec {
77 pname = "asyncssh";
8− version = "1.15.1";
8+ version = "1.16.1";
99 disabled = pythonOlder "3.4";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "f2065a8b3af0c514c8de264e7b01f08df5213b707bacb7e7c080bd46c3e3bc35";
13+ sha256 = "0qia1ay2dhwps5sfh0hif7mrv7yxvykxs9l7cmfp4m6hmqnn3r5r";
1414 };
1515
16+ patches = [
17+ # Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730
18+ #
19+ # This changed the test to avoid setting the sticky bit
20+ # because that's not allowed for plain files in FreeBSD.
21+ # However that broke the test on NixOS, failing with
22+ # "Operation not permitted"
23+ ./fix-sftp-chmod-test-nixos.patch
24+
25+ # Restore libnacl support for curve25519/ed25519 as a fallback for PyCA
26+ # Fixes https://github.com/ronf/asyncssh/issues/206 with older openssl
27+ (fetchpatch {
28+ url = "https://github.com/ronf/asyncssh/commit/1dee113bb3e4a6888de562b0413e9abd6a0f0f04.patch";
29+ sha256 = "04bckdj7i6xk24lizkn3a8cj375pkz7yc57fc0vk222c6jzwzaml";
30+ })
31+ ];
32+
1633 propagatedBuildInputs = [
1734 bcrypt
1835 cryptography
@@ -23,17 +40,20 @@ buildPythonPackage rec {
2340 pyopenssl
2441 ];
2542
26− checkInputs = [ openssl ];
43+ checkInputs = [
44+ openssh
45+ openssl
46+ ];
2747
2848 # Disables windows specific test (specifically the GSSAPI wrapper for Windows)
2949 postPatch = ''
30− rm ./tests/sspi_stub.py
50+ rm tests/sspi_stub.py
3151 '';
3252
3353 meta = with stdenv.lib; {
3454 description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework";
35− homepage = https://pypi.python.org/pypi/asyncssh;
36− license = licenses.epl20;
55+ homepage = https://asyncssh.readthedocs.io/en/latest;
56+ license = licenses.epl20;
3757 maintainers = with maintainers; [ worldofpeace ];
3858 };
3959}
pkgs/development/python-modules/asyncssh/fix-sftp-chmod-test-nixos.patchnew file+15
@@ -0,0 +1,15 @@
1+diff --git a/tests/test_sftp.py b/tests/test_sftp.py
2+index db9cc88..234004b 100644
3+--- a/tests/test_sftp.py
4++++ b/tests/test_sftp.py
5+@@ -957,8 +957,8 @@ class _TestSFTP(_CheckSFTP):
6+
7+ try:
8+ self._create_file('file')
9+- yield from sftp.chmod('file', 0o4321)
10+- self.assertEqual(stat.S_IMODE(os.stat('file').st_mode), 0o4321)
11++ yield from sftp.chmod('file', 0o1234)
12++ self.assertEqual(stat.S_IMODE(os.stat('file').st_mode), 0o1234)
13+ finally:
14+ remove('file')
15+
pkgs/development/python-modules/atomman/default.nix+2−2
@@ -13,12 +13,12 @@
1313}:
1414
1515buildPythonPackage rec {
16− version = "1.2.5";
16+ version = "1.2.6";
1717 pname = "atomman";
1818
1919 src = fetchPypi {
2020 inherit pname version;
21− sha256 = "10eca8c6fc890f2ee2e30f65178c618175529e9998be449e276f7c3d1dce0e95";
21+ sha256 = "19501bfdf7e66090764a0ccbecf85a128b46333ea232c2137fa4345512b8b502";
2222 };
2323
2424 checkInputs = [ pytest ];
pkgs/development/python-modules/aws-sam-translator/default.nix−2
@@ -20,8 +20,6 @@ buildPythonPackage rec {
2020 # Tests are not included in the PyPI package
2121 doCheck = false;
2222
23− disabled = isPy3k;
24−
2523 propagatedBuildInputs = [
2624 boto3
2725 enum34
pkgs/development/python-modules/azure-common/default.nix+2−2
@@ -7,14 +7,14 @@
77}:
88
99buildPythonPackage rec {
10− version = "1.1.18";
10+ version = "1.1.19";
1111 pname = "azure-common";
1212 disabled = isPyPy;
1313
1414 src = fetchPypi {
1515 inherit pname version;
1616 extension = "zip";
17− sha256 = "5fd62ae10b1add97d3c69af970328ec3bd869184396bcf6bfa9c7bc94d688424";
17+ sha256 = "622d9360a1b61172b4c0d1cc58f939c68402aa19ca44872ab3d224d913aa6d0c";
1818 };
1919
2020 propagatedBuildInputs = [ azure-nspkg ];
pkgs/development/python-modules/cffi/default.nix+3−3
@@ -2,11 +2,11 @@
22
33if isPyPy then null else buildPythonPackage rec {
44 pname = "cffi";
5− version = "1.12.2";
5+ version = "1.12.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "e113878a446c6228669144ae8a56e268c91b7f1fafae927adc4879d9849e0ea7";
9+ sha256 = "041c81822e9f84b1d9c401182e174996f0bae9991f33725d059b771744290774";
1010 };
1111
1212 outputs = [ "out" "dev" ];
@@ -31,7 +31,7 @@ if isPyPy then null else buildPythonPackage rec {
3131 # The tests use -Werror but with python3.6 clang detects some unreachable code.
3232 NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ];
3333
34− doCheck = !stdenv.hostPlatform.isMusl; # TODO: Investigate
34+ doCheck = !stdenv.hostPlatform.isMusl && !stdenv.isDarwin; # TODO: Investigate
3535 checkPhase = ''
3636 py.test -k "not test_char_pointer_conversion"
3737 '';
pkgs/development/python-modules/cfn-lint/default.nixnew file+40
@@ -0,0 +1,40 @@
1+{ lib
2+, buildPythonPackage
3+, fetchPypi
4+, pyyaml
5+, six
6+, requests
7+, aws-sam-translator
8+, jsonpatch
9+, jsonschema
10+, pathlib2
11+}:
12+
13+buildPythonPackage rec {
14+ pname = "cfn-lint";
15+ version = "0.19.1";
16+
17+ src = fetchPypi {
18+ inherit pname version;
19+ sha256 = "5a723ff791fc23aced78e9cde28f18f9eeae9a24f91db2b7a20f7aa837a613b3";
20+ };
21+
22+ propagatedBuildInputs = [
23+ pyyaml
24+ six
25+ requests
26+ aws-sam-translator
27+ jsonpatch
28+ jsonschema
29+ pathlib2
30+ ];
31+
32+ # No tests included in archive
33+ doCheck = false;
34+
35+ meta = with lib; {
36+ description = "Checks cloudformation for practices and behaviour that could potentially be improved";
37+ homepage = https://github.com/aws-cloudformation/cfn-python-lint;
38+ license = licenses.mit;
39+ };
40+}
pkgs/development/python-modules/cryptography/default.nix−8
@@ -53,14 +53,6 @@ buildPythonPackage rec {
5353 py.test --disable-pytest-warnings tests
5454 '';
5555
56− # The test assumes that if we're on Sierra or higher, that we use `getentropy`, but for binary
57− # compatibility with pre-Sierra for binary caches, we hide that symbol so the library doesn't
58− # use it. This boils down to them checking compatibility with `getentropy` in two different places,
59− # so let's neuter the second test.
60− postPatch = ''
61− substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"'
62− '';
63−
6456 # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
6557 # can do until nix 1.11's release
6658 __impureHostDeps = [ "/usr/lib" ];
pkgs/development/python-modules/cx_oracle/default.nix+2−2
@@ -2,13 +2,13 @@
22
33buildPythonPackage rec {
44 pname = "cx_Oracle";
5− version = "7.1.2";
5+ version = "7.1.3";
66
77 buildInputs = [ odpic ];
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "7d0e30d6ce62bedd41ae4885d43fff727314b67655ec8737b8af5cc0aad7f925";
11+ sha256 = "4f26b7418e2796112f8b36338a2f9a7c07dd08df53d857e3478bb53f61dd52e4";
1212 };
1313
1414 preConfigure = ''
pkgs/development/python-modules/cypari2/default.nix+2−2
@@ -11,11 +11,11 @@
1111buildPythonPackage rec {
1212 pname = "cypari2";
1313 # upgrade may break sage, please test the sage build or ping @timokau on upgrade
14− version = "2.1.0";
14+ version = "2.1.1";
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "0bm5jvmwqp48n6b385mw4v7wsws9zk62mgb7xf5ymiq7k6wgvxli";
18+ sha256 = "df1ef62e771ec36e5a456f5fc8b51bc6745b70f0efdd0c7a30c3f0b5f1fb93db";
1919 };
2020
2121 # This differs slightly from the default python installPhase in that it pip-installs
pkgs/development/python-modules/django_silk/default.nix+2−2
@@ -16,11 +16,11 @@
1616
1717buildPythonPackage rec {
1818 pname = "django-silk";
19− version = "3.0.1";
19+ version = "3.0.2";
2020
2121 src = fetchPypi {
2222 inherit pname version;
23− sha256 = "bce0e35d2a6ec3688a0c062c6964695beef4a452be48085f2c1e25f685652d9d";
23+ sha256 = "8dd5b78531360bd8c3d571384f9f4f82ef03e1764e30dd4621c5638f5c973a1d";
2424 };
2525
2626 doCheck = false;
pkgs/development/python-modules/ecdsa/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "ecdsa";
9− version = "0.13";
9+ version = "0.13.2";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4";
13+ sha256 = "5c034ffa23413ac923541ceb3ac14ec15a0d2530690413bff58c12b80e56d884";
1414 };
1515
1616 # Only needed for tests
pkgs/development/python-modules/genanki/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "genanki";
7− version = "0.6.3";
7+ version = "0.6.4";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "2408f7d9955c8963fd9b1ecbb873f5d18dee786e060dcb083aef5dd86c736773";
11+ sha256 = "6d17761e06aca2d9acb588acfdce33fd3d05571338825760622c99fc7210f15a";
1212 };
1313
1414 propagatedBuildInputs = [
pkgs/development/python-modules/gsd/default.nix+2−2
@@ -5,12 +5,12 @@
55}:
66
77buildPythonPackage rec {
8− version = "1.6.1";
8+ version = "1.6.2";
99 pname = "gsd";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "18icw5cbsq4gnhx4vsjwhxzcx11mbnz6kmwgrylkf82m7m1v2921";
13+ sha256 = "58a6669f2375936810d74c3ee7e62c5616acf9e15aa32603701e55ab6fada5f5";
1414 };
1515
1616 propagatedBuildInputs = [ numpy ];
pkgs/development/python-modules/httplib2/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "httplib2";
5− version = "0.12.1";
5+ version = "0.12.3";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "4ba6b8fd77d0038769bf3c33c9a96a6f752bc4cdf739701fdcaf210121f399d4";
9+ sha256 = "a18121c7c72a56689efbf1aef990139ad940fee1e64c6f2458831736cd593600";
1010 };
1111
1212 # Needs setting up
pkgs/development/python-modules/j2cli/default.nix+2−2
@@ -9,12 +9,12 @@
99
1010buildPythonPackage rec {
1111 pname = "j2cli";
12− version = "0.3.6.post1";
12+ version = "0.3.7";
1313 disabled = isPy3k;
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "1j8s09b75w041b2lawjz341ri997n9fnxbd2ipm9czxj6fhj8hi2";
17+ sha256 = "a7b0bdb02a3afb6d2eff40228b2216306332ace4341372310dafd15f938e1afa";
1818 };
1919
2020 buildInputs = [ nose ];
pkgs/development/python-modules/jdcal/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "jdcal";
9− version = "1.4";
9+ version = "1.4.1";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "ea0a5067c5f0f50ad4c7bdc80abad3d976604f6fb026b0b3a17a9d84bb9046c9";
13+ sha256 = "472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8";
1414 };
1515
1616 checkInputs = [ pytest ];
pkgs/development/python-modules/jinja2/default.nix−3
@@ -17,9 +17,6 @@ buildPythonPackage rec {
1717 pytest -v tests
1818 '';
1919
20− # RecursionError: maximum recursion depth exceeded
21− doCheck = false;
22−
2320 meta = with stdenv.lib; {
2421 homepage = http://jinja.pocoo.org/;
2522 description = "Stand-alone template engine";
pkgs/development/python-modules/junos-eznc/default.nix+2−2
@@ -15,11 +15,11 @@
1515
1616buildPythonPackage rec {
1717 pname = "junos-eznc";
18− version = "2.2.0";
18+ version = "2.2.1";
1919
2020 src = fetchPypi {
2121 inherit pname version;
22− sha256 = "d97d8babf650abca25a096825aa6d88573d340481a0b0793afcdac4a7bee09d3";
22+ sha256 = "0133a10ba3d46ddf70f0ba6620aa3b92e5533f08c57edd000dbffd8fe60d586d";
2323 };
2424
2525
pkgs/development/python-modules/matplotlib/2.nix+1−1
@@ -60,7 +60,7 @@ buildPythonPackage rec {
6060 url = "https://github.com/matplotlib/matplotlib/commit/2980184d092382a40ab21f95b79582ffae6e19d6.patch";
6161 sha256 = "1c0wj28zy8s5h6qiavx9zzbhlmhjwpzbc3fyyw9039mbnqk0spg2";
6262 })
63− ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv-2.2.3.patch ];
63+ ];
6464
6565 # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the
6666 # corresponding interpreter object for its library paths. This fails if
pkgs/development/python-modules/matplotlib/darwin-stdenv-2.2.3.patchdeleted−10
@@ -1,10 +0,0 @@
1−--- a/src/_macosx.m 2015-10-30 00:46:20.000000000 +0200
2−+++ b/src/_macosx.m 2015-11-01 14:52:25.000000000 +0200
3−@@ -6264,6 +6264,7 @@
4−
5− static bool verify_framework(void)
6− {
7−+ return true; /* nixpkgs darwin stdenv */
8− #ifdef COMPILING_FOR_10_6
9− NSRunningApplication* app = [NSRunningApplication currentApplication];
10− NSApplicationActivationPolicy activationPolicy = [app activationPolicy];
pkgs/development/python-modules/matplotlib/darwin-stdenv.patchdeleted−12
@@ -1,12 +0,0 @@
1−diff -ruN matplotlib-3.0.0/src/_macosx.m matplotlib-3.0.0.patched/src/_macosx.m
2−--- matplotlib-3.0.0/src/_macosx.m 2018-09-16 00:35:21.000000000 +0200
3−+++ matplotlib-3.0.0.patched/src/_macosx.m 2018-11-03 13:14:33.000000000 +0100
4−@@ -2577,6 +2577,7 @@
5−
6− static bool verify_framework(void)
7− {
8−+ return true; /* nixpkgs darwin stdenv */
9− ProcessSerialNumber psn;
10− /* These methods are deprecated, but they don't require the app to
11− have started */
12−
pkgs/development/python-modules/matplotlib/default.nix+1−2
@@ -52,8 +52,7 @@ buildPythonPackage rec {
5252 ++ stdenv.lib.optionals enableQt [ pyqt4 ];
5353
5454 patches =
55− [ ./basedirlist.patch ] ++
56− stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv.patch ];
55+ [ ./basedirlist.patch ];
5756
5857 # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the
5958 # corresponding interpreter object for its library paths. This fails if
pkgs/development/python-modules/mecab-python3/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "mecab-python3";
10− version = "0.996.1";
10+ version = "0.996.2";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "5aca4d0d196161e41452b89921042c0e61a6b7e7e9373211c0c1c50d1809055d";
14+ sha256 = "a80383fba343dad247b486a9afa486b7f0ec6244cb8bbf2d6a24d2fab5f19180";
1515 };
1616
1717 nativeBuildInputs = [
pkgs/development/python-modules/moto/default.nix+4−3
@@ -1,14 +1,14 @@
1−{ buildPythonPackage, fetchPypi, jinja2, werkzeug, flask
1+{ buildPythonPackage, fetchPypi, jinja2, werkzeug, flask, cfn-lint
22, requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker, responses
33, six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml, python-jose }:
44
55buildPythonPackage rec {
66 pname = "moto";
7− version = "1.3.7";
7+ version = "1.3.8";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "129de2e04cb250d9f8b2c722ec152ed1b5426ef179b4ebb03e9ec36e6eb3fcc5";
11+ sha256 = "9cb02134148fbe3ed81f11d6ab9bd71bbd6bc2db7e59a45de77fb1d0fedb744e";
1212 };
1313
1414 postPatch = ''
@@ -24,6 +24,7 @@ buildPythonPackage rec {
2424 aws-xray-sdk
2525 boto
2626 boto3
27+ cfn-lint
2728 dateutil
2829 flask
2930 httpretty
pkgs/development/python-modules/nameparser/default.nix+2−2
@@ -6,11 +6,11 @@
66
77buildPythonPackage rec {
88 pname = "nameparser";
9− version = "1.0.2";
9+ version = "1.0.3";
1010
1111 src = fetchPypi {
1212 inherit pname version;
13− sha256 = "0w1m8qva2d7xfqrdxsnh1cncr3ank2205i5rz44hawjh2frzmik2";
13+ sha256 = "c01ec7d0bc093420a45d8b5ea8261a84ba12bff0cabf47cb15b716c5ea8f3d23";
1414 };
1515
1616 LC_ALL="en_US.UTF-8";
pkgs/development/python-modules/nilearn/default.nix+2−2
@@ -3,12 +3,12 @@
33
44buildPythonPackage rec {
55 pname = "nilearn";
6− version = "0.5.1";
6+ version = "0.5.2";
77 name = pname + "-" + version;
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "dca56e8a1f0fc6dcd1c997383187efc31788294ac6bcbbaebac2b9a962a44cbb";
11+ sha256 = "18b763d641e6903bdf8512e0ec5cdc14133fb4679e9a15648415e9be62c81b56";
1212 };
1313
1414 # disable some failing tests
pkgs/development/python-modules/numpy/default.nix+3−3
@@ -16,18 +16,18 @@ let
1616 };
1717in buildPythonPackage rec {
1818 pname = "numpy";
19− version = "1.16.2";
19+ version = "1.16.3";
2020
2121 src = fetchPypi {
2222 inherit pname version;
2323 extension = "zip";
24− sha256 = "1c4inssky16p6ab63n1gass6dik1dzxrp3y7kmxbdq6xg4w2wsbc";
24+ sha256 = "78a6f89da87eeb48014ec652a65c4ffde370c036d780a995edaeb121d3625621";
2525 };
2626
2727 nativeBuildInputs = [ gfortran pytest ];
2828 buildInputs = [ blas ];
2929
30− patches = lib.optionals (python.hasDistutilsCxxPatch or false) [
30+ patches = lib.optionals python.hasDistutilsCxxPatch [
3131 # We patch cpython/distutils to fix https://bugs.python.org/issue1222585
3232 # Patching of numpy.distutils is needed to prevent it from undoing the
3333 # patch to distutils.
pkgs/development/python-modules/objgraph/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "objgraph";
13− version = "3.4.0";
13+ version = "3.4.1";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "4a0c2c6268e10a9e8176ae054ff3faac9a432087801e1f95c3ebbe52550295a0";
17+ sha256 = "bf29512d7f8b457b53fa0722ea59f516abb8abc59b78f97f0ef81394a0c615a7";
1818 };
1919
2020 # Tests fail with PyPy.
pkgs/development/python-modules/paho-mqtt/default.nix+3−1
@@ -1,5 +1,5 @@
11{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
2−, pytestrunner, pytest, mock }:
2+, stdenv, pytestrunner, pytest, mock }:
33
44buildPythonPackage rec {
55 pname = "paho-mqtt";
@@ -20,6 +20,8 @@ buildPythonPackage rec {
2020
2121 checkInputs = [ pytestrunner pytest ] ++ lib.optional (!isPy3k) mock;
2222
23+ doCheck = !stdenv.isDarwin;
24+
2325 meta = with lib; {
2426 homepage = https://eclipse.org/paho;
2527 description = "MQTT version 3.1.1 client class";
pkgs/development/python-modules/papis/default.nix+3
@@ -5,6 +5,7 @@
55, prompt_toolkit, pygments
66#, optional, dependencies
77, jinja2, whoosh, pytest
8+, stdenv
89}:
910
1011buildPythonPackage rec {
@@ -28,6 +29,8 @@ buildPythonPackage rec {
2829 jinja2 whoosh
2930 ];
3031
32+ doCheck = !stdenv.isDarwin;
33+
3134 checkInputs = ([
3235 pytest
3336 ]) ++ [
pkgs/development/python-modules/phonenumbers/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "phonenumbers";
5− version = "8.10.9";
5+ version = "8.10.10";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "d9cf2e8e4ad40552487ab47182bc9759fca1edaa7d513e95a9f20c6742416234";
9+ sha256 = "dabc8cfcff96446b0787ea337739ea286ec3949ec27a4790a9b4587817da5c5f";
1010 };
1111
1212 meta = {
pkgs/development/python-modules/pyasn1-modules/default.nix+19−3
@@ -1,16 +1,32 @@
1−{ stdenv, buildPythonPackage, fetchPypi, pyasn1, isPyPy }:
1+{ stdenv
2+, buildPythonPackage
3+, fetchPypi
4+, pyasn1
5+, isPyPy
6+, pytest
7+}:
28
39buildPythonPackage rec {
410 pname = "pyasn1-modules";
5− version = "0.2.4";
11+ version = "0.2.5";
612
713 src = fetchPypi {
814 inherit pname version;
9− sha256 = "a52090e8c5841ebbf08ae455146792d9ef3e8445b21055d3a3b7ed9c712b7c7c";
15+ sha256 = "ef721f68f7951fab9b0404d42590f479e30d9005daccb1699b0a51bb4177db96";
1016 };
1117
1218 propagatedBuildInputs = [ pyasn1 ];
1319
20+ checkInputs = [
21+ pytest
22+ ];
23+
24+ # running tests through setup.py fails only for python2 for some reason:
25+ # AttributeError: 'module' object has no attribute 'suitetests'
26+ checkPhase = ''
27+ py.test
28+ '';
29+
1430 meta = with stdenv.lib; {
1531 description = "A collection of ASN.1-based protocols modules";
1632 homepage = https://pypi.python.org/pypi/pyasn1-modules;
pkgs/development/python-modules/pycairo/default.nix+2−2
@@ -2,7 +2,7 @@
22
33buildPythonPackage rec {
44 pname = "pycairo";
5− version = "1.18.0";
5+ version = "1.18.1";
66
77 format = "other";
88
@@ -12,7 +12,7 @@ buildPythonPackage rec {
1212 owner = "pygobject";
1313 repo = "pycairo";
1414 rev = "v${version}";
15− sha256 = "0k266cf477j74v7mv0d4jxaq3wx8b7qa85qgh68cn094gzaasqd9";
15+ sha256 = "0f4l7d1ibkk8xdspyv5zx8fah9z3x775bd91zirnp37vlgqds7xj";
1616 };
1717
1818 nativeBuildInputs = [
pkgs/development/python-modules/pygobject/3.nix+2−2
@@ -3,13 +3,13 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
33
44buildPythonPackage rec {
55 pname = "pygobject";
6− version = "3.32.0";
6+ version = "3.32.1";
77
88 format = "other";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "0agg8nxgqp96wyw4qnjjpiczf0j8aw454plwsfqccsyykzjxgx43";
12+ sha256 = "1n04dnvq3bx7vk7pgnxlg6kiwnc7xxv9bjabkv7abpmqjkprvj9j";
1313 };
1414
1515 outputs = [ "out" "dev" ];
pkgs/development/python-modules/pyro-ppl/default.nix+2−2
@@ -1,12 +1,12 @@
11{ buildPythonPackage, fetchPypi, lib, pytorch, contextlib2
22, graphviz, networkx, six, opt-einsum, tqdm }:
33buildPythonPackage rec {
4− version = "0.3.1.post1";
4+ version = "0.3.2";
55 pname = "pyro-ppl";
66
77 src = fetchPypi {
88 inherit version pname;
9− sha256 = "f5174bcd1b74fb455db948413dcbf5ac1a13dbddc6c54c6d215dd2e4b6b9548d";
9+ sha256 = "f00db7e7747e016479ef65e3f00115d66a4200e59914f016d50e4d3e32bc94b0";
1010 };
1111
1212 propagatedBuildInputs = [
pkgs/development/python-modules/pyrr/default.nix+2−2
@@ -7,12 +7,12 @@
77}:
88
99buildPythonPackage rec {
10− version = "0.10.2";
10+ version = "0.10.3";
1111 pname = "pyrr";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "1q9i4qa6ygr8hlpnw55s58naynxzwm0sc1m54wyy1ghbf8m8d2f0";
15+ sha256 = "3c0f7b20326e71f706a610d58f2190fff73af01eef60c19cb188b186f0ec7e1d";
1616 };
1717
1818 buildInputs = [ setuptools ];
pkgs/development/python-modules/pyspark/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pyspark";
5− version = "2.4.1";
5+ version = "2.4.2";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "923cc4075d586074f68b722f5ed029b0d25396828441b5ed421a0e40fe14e749";
9+ sha256 = "5ab07ed12c3c9035bfaad93921887736abf89130130b38de7dfa985e50542438";
1010 };
1111
1212 # pypandoc is broken with pandoc2, so we just lose docs.
pkgs/development/python-modules/pytest-mock/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "pytest-mock";
5− version = "1.10.3";
5+ version = "1.10.4";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "330bfa1a71c9b6e84e2976f01d70d8a174f755e7f9dc5b22f4b7335992e1e98b";
9+ sha256 = "5bf5771b1db93beac965a7347dc81c675ec4090cb841e49d9d34637a25c30568";
1010 };
1111
1212 propagatedBuildInputs = lib.optional (!isPy3k) mock;
pkgs/development/python-modules/ruamel_yaml/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "ruamel.yaml";
11− version = "0.15.92";
11+ version = "0.15.94";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "c6d05e38a141922eca7902135e7a40b605763d6da8ec6624517370631ce9fb6d";
15+ sha256 = "0939bcb399ad037ef903d74ccf2f8a074f06683bc89133ad19305067d34487c8";
1616 };
1717
1818 # Tests cannot load the module to test
pkgs/development/python-modules/s3fs/default.nix+2−2
@@ -2,11 +2,11 @@
22
33buildPythonPackage rec {
44 pname = "s3fs";
5− version = "0.2.0";
5+ version = "0.2.1";
66
77 src = fetchPypi {
88 inherit pname version;
9− sha256 = "1p14sm3lbkwz2fidiinmyfyxwkh58ymjb0c0bsv5i0zfv0fy87x3";
9+ sha256 = "2146aae91ba3a06d7bfa7130688219599f8696d2825fb00f62923bb56f6e7ed3";
1010 };
1111
1212 buildInputs = [ docutils ];
pkgs/development/python-modules/setuptools/default.nix+2−2
@@ -8,13 +8,13 @@
88# Should use buildPythonPackage here somehow
99stdenv.mkDerivation rec {
1010 pname = "setuptools";
11− version = "41.0.0";
11+ version = "41.0.1";
1212 name = "${python.libPrefix}-${pname}-${version}";
1313
1414 src = fetchPypi {
1515 inherit pname version;
1616 extension = "zip";
17− sha256 = "79d30254b6fe7a8e672e43cd85f13a9f3f2a50080bc81d851143e2219ef0dcb1";
17+ sha256 = "a222d126f5471598053c9a77f4b5d4f26eaa1f150ad6e01dcf1a42e185d05613";
1818 };
1919
2020 nativeBuildInputs = [ unzip wrapPython python.pythonForBuild ];
pkgs/development/python-modules/smart_open/default.nix+2−2
@@ -12,11 +12,11 @@
1212
1313buildPythonPackage rec {
1414 pname = "smart_open";
15− version = "1.8.1";
15+ version = "1.8.2";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "0a38mwlz92mlaxz8f8z4yyacpgykiysbcwfykrgr74vlic8x4m5i";
19+ sha256 = "d3c16477ad7e8f94ab033630ea31993670ad21153172367db1acb143077d501c";
2020 };
2121
2222 # nixpkgs version of moto is >=1.2.0, remove version pin to fix build
pkgs/development/python-modules/sparqlwrapper/default.nix+2−2
@@ -10,11 +10,11 @@
1010
1111buildPythonPackage rec {
1212 pname = "SPARQLWrapper";
13− version = "1.8.2";
13+ version = "1.8.4";
1414
1515 src = fetchPypi {
1616 inherit pname version;
17− sha256 = "7f4c8d38ea1bfcffbc358c9a05de35a3fd7152cc3e8ea57963ee7a0a242f7a5e";
17+ sha256 = "21928e7a97f565e772cdeeb0abad428960f4307e3a13dbdd8f6d3da8a6a506c9";
1818 };
1919
2020 # break circular dependency loop
pkgs/development/python-modules/sqlalchemy-migrate/default.nix+2
@@ -21,6 +21,8 @@ buildPythonPackage rec {
2121 checkInputs = [ unittest2 scripttest pytz mock testtools testrepository ];
2222 propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ];
2323
24+ doCheck = !stdenv.isDarwin;
25+
2426 prePatch = ''
2527 sed -i -e /tempest-lib/d \
2628 -e /testtools/d \
pkgs/development/python-modules/sseclient/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "sseclient";
7− version = "0.0.23";
7+ version = "0.0.24";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "82a1d281b2bcb98847882069bde57a6772156f9539ddefbb78fea4f915197ec3";
11+ sha256 = "1b4c5119b9381cb6ddaf3236f3f7e1437a14e488d1ed61336873a839788481b0";
1212 };
1313
1414 propagatedBuildInputs = [ requests six ];
pkgs/development/python-modules/typed-ast/default.nix+2−2
@@ -1,10 +1,10 @@
11{ buildPythonPackage, fetchPypi, lib, pythonOlder }:
22buildPythonPackage rec {
33 pname = "typed-ast";
4− version = "1.3.1";
4+ version = "1.3.4";
55 src = fetchPypi{
66 inherit pname version;
7− sha256 = "606d8afa07eef77280c2bf84335e24390055b478392e1975f96286d99d0cb424";
7+ sha256 = "68c362848d9fb71d3c3e5f43c09974a0ae319144634e7a47db62f0f2a54a7fa7";
88 };
99 # Only works with Python 3.3 and newer;
1010 disabled = pythonOlder "3.3";
pkgs/development/python-modules/urllib3/default.nix+2−2
@@ -4,11 +4,11 @@
44
55buildPythonPackage rec {
66 pname = "urllib3";
7− version = "1.24.1";
7+ version = "1.24.2";
88
99 src = fetchPypi {
1010 inherit pname version;
11− sha256 = "de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22";
11+ sha256 = "9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3";
1212 };
1313
1414 NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
pkgs/development/python-modules/xkcdpass/default.nix+2−2
@@ -5,11 +5,11 @@
55
66buildPythonPackage rec {
77 pname = "xkcdpass";
8− version = "1.17.2";
8+ version = "1.17.3";
99
1010 src = fetchPypi {
1111 inherit pname version;
12− sha256 = "ae7ad57c0287cc41c8c9f164b59296463f2e009d4b7aed382160cb40dfb4d91b";
12+ sha256 = "95cf3fd41130606ba64ec7edb9efac7c5d61efe21abab51a2c21ccbbebc48bb6";
1313 };
1414
1515 # No tests included
pkgs/development/python-modules/xlib/default.nix+2
@@ -30,6 +30,8 @@ buildPythonPackage rec {
3030 buildInputs = [ xorg.libX11 ];
3131 propagatedBuildInputs = [ six ];
3232
33+ doCheck = !stdenv.isDarwin;
34+
3335 meta = with stdenv.lib; {
3436 description = "Fully functional X client library for Python programs";
3537 homepage = http://python-xlib.sourceforge.net/;
pkgs/development/python-modules/xml2rfc/default.nix+3
@@ -1,5 +1,6 @@
11{ lib, fetchPypi, buildPythonPackage, intervaltree, pyflakes, requests, lxml, google-i18n-address
22, pycountry, html5lib, six
3+, stdenv
34}:
45
56buildPythonPackage rec {
@@ -26,6 +27,8 @@ buildPythonPackage rec {
2627 export HOME=$(mktemp -d)
2728 '';
2829
30+ doCheck = !stdenv.isDarwin;
31+
2932 meta = with lib; {
3033 description = "Tool generating IETF RFCs and drafts from XML sources";
3134 homepage = https://tools.ietf.org/tools/xml2rfc/trac/;
pkgs/development/python-modules/zope_testrunner/default.nix+2
@@ -19,6 +19,8 @@ buildPythonPackage rec {
1919
2020 propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ];
2121
22+ doCheck = !stdenv.isDarwin;
23+
2224 meta = with stdenv.lib; {
2325 description = "A flexible test runner with layer support";
2426 homepage = https://pypi.python.org/pypi/zope.testrunner;
pkgs/development/tools/analysis/valgrind/default.nix+5−14
@@ -1,18 +1,15 @@
1−{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds, autoreconfHook }:
1+{ stdenv, fetchurl, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }:
22
33stdenv.mkDerivation rec {
4− name = "valgrind-3.14.0";
4+ name = "valgrind-3.15.0";
55
66 src = fetchurl {
77 url = "https://sourceware.org/pub/valgrind/${name}.tar.bz2";
8− sha256 = "19ds42jwd89zrsjb94g7gizkkzipn8xik3xykrpcqxylxyzi2z03";
8+ sha256 = "1ccawxrni8brcvwhygy12iprkvz409hbr9xkk1bd03gnm2fplz21";
99 };
1010
11− # autoreconfHook is needed to pick up patching of Makefile.am
12− # Remove when the patch no longer applies.
13− patches = [ ./coregrind-makefile-race.patch ];
1411 # Perl is needed for `cg_annotate'.
15− nativeBuildInputs = [ autoreconfHook perl ];
12+ nativeBuildInputs = [ perl ];
1613
1714 outputs = [ "out" "dev" "man" "doc" ];
1815
@@ -44,14 +41,8 @@ stdenv.mkDerivation rec {
4441 substituteInPlace coregrind/Makefile.in \
4542 --replace /usr/include/mach ${xnu}/include/mach
4643
47− echo "substitute hardcoded dsymutil with ${llvm}/bin/llvm-dsymutil"
48− find -name "Makefile.in" | while read file; do
49− substituteInPlace "$file" \
50− --replace dsymutil ${llvm}/bin/llvm-dsymutil
51− done
52−
5344 substituteInPlace coregrind/m_debuginfo/readmacho.c \
54− --replace /usr/bin/dsymutil ${llvm}/bin/llvm-dsymutil
45+ --replace /usr/bin/dsymutil ${stdenv.cc.bintools.bintools}/bin/dsymutil
5546
5647 echo "substitute hardcoded /usr/bin/ld with ${cctools}/bin/ld"
5748 substituteInPlace coregrind/link_tool_exe_darwin.in \
pkgs/development/tools/build-managers/cmake/application-services.patch+6−6
@@ -2,16 +2,16 @@ diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
22index 8aff8f6..af1852d 100644
33--- a/Source/CMakeLists.txt
44+++ b/Source/CMakeLists.txt
5−@@ -791,12 +791,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc"
5+@@ -791,12 +791,11 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc"
66 endif()
77 endif()
88
9−-# On Apple we need CoreFoundation and CoreServices
10−-if(APPLE)
11−- target_link_libraries(CMakeLib "-framework CoreFoundation")
9+ # On Apple we need CoreFoundation and CoreServices
10+ if(APPLE)
11+ target_link_libraries(CMakeLib "-framework CoreFoundation")
1212- target_link_libraries(CMakeLib "-framework CoreServices")
13−-endif()
14−-
13+ endif()
14+
1515 if(WIN32 AND NOT UNIX)
1616 # We need the rpcrt4 library on Windows.
1717 # We need the crypt32 library on Windows for crypto/cert APIs.
pkgs/development/tools/build-managers/cmake/default.nix+1−2
@@ -2,7 +2,7 @@
22, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
33, buildPackages
44# darwin attributes
5−, cf-private, ps
5+, ps
66, isBootstrap ? false
77, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
88, useNcurses ? false, ncurses
@@ -52,7 +52,6 @@ stdenv.mkDerivation rec {
5252
5353 buildInputs =
5454 [ setupHook pkgconfig ]
55− ++ optional stdenv.isDarwin cf-private # needed for CFBundleCopyExecutableURL
5655 ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
5756 ++ optional useNcurses ncurses
5857 ++ optional useQt4 qt4
pkgs/development/tools/build-managers/dub/default.nix+1−1
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
3232 ./build.sh
3333 '';
3434
35− doCheck = true;
35+ doCheck = !stdenv.isDarwin;
3636
3737 checkPhase = ''
3838 export DUB=$NIX_BUILD_TOP/source/bin/dub
pkgs/development/tools/gnulib/default.nix+5−4
@@ -1,12 +1,13 @@
11{ stdenv, fetchgit }:
22
33stdenv.mkDerivation {
4− name = "gnulib-20180226";
4+ pname = "gnulib";
5+ version = "20190326";
56
67 src = fetchgit {
7− url = "https://git.savannah.gnu.org/r/gnulib.git";
8− rev = "0bec5d56c6938c2f28417bb5fd1c4b05ea2e7d28";
9− sha256 = "0sifr3bkmhyr5s6ljgfyr0fw6w49ajf11rlp1r797f3r3r6j9w4k";
8+ url = https://git.savannah.gnu.org/r/gnulib.git;
9+ rev = "a18f7ce3c0aa760c33d46bbeb8e5b3a14cf24984";
10+ sha256 = "04py5n3j17wyqv9wfsslcrxzapni9vmw6p5g0adzy2md3ygjw4x4";
1011 };
1112
1213 dontFixup = true;
pkgs/stdenv/darwin/darwin-secure-format.patch → pkgs/development/tools/misc/gnum4/darwin-secure-format.patchrenamed

The content is the same.

pkgs/development/tools/misc/gnum4/default.nix+2−1
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
1313 configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ];
1414
1515 # Upstream is aware of it; it may be in the next release.
16− patches = [ ./s_isdir.patch ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin stdenv.secure-format-patch;
16+ patches = [ ./s_isdir.patch ]
17+ ++ stdenv.lib.optional stdenv.isDarwin ./darwin-secure-format.patch;
1718
1819 meta = {
1920 homepage = https://www.gnu.org/software/m4/;
pkgs/development/tools/misc/tokei/default.nix+3−1
@@ -1,4 +1,4 @@
1−{ stdenv, fetchFromGitHub, rustPlatform }:
1+{ stdenv, fetchFromGitHub, rustPlatform, libiconv }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "tokei";
@@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec {
1313
1414 cargoSha256 = "1xai3jxvs8r3s3v5d5w40miw6nihnj9gzlzzdrwphmgrkywr88c4";
1515
16+ buildInputs = [ libiconv ];
17+
1618 meta = with stdenv.lib; {
1719 description = "Program that displays statistics about your code";
1820 homepage = https://github.com/XAMPPRocky/tokei;
pkgs/development/tools/xcbuild/toolchains.nix+1
@@ -67,6 +67,7 @@ runCommand "Toolchains" {} (''
6767 done
6868
6969 ln -s ${buildPackages.darwin.bootstrap_cmds}/bin/mig $toolchain/bin
70+ mkdir -p $toolchain/libexec
7071 ln -s ${buildPackages.darwin.bootstrap_cmds}/libexec/migcom $toolchain/libexec
7172 ln -s ${mkdep-darwin-src} $toolchain/bin/mkdep
7273'')
pkgs/development/tools/xcbuild/wrapper.nix+7−7
@@ -1,6 +1,6 @@
11{ stdenv, lib, buildPackages, makeWrapper, writeText, runCommand
22, CoreServices, ImageIO, CoreGraphics
3−, runtimeShell
3+, runtimeShell, callPackage
44, xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX"
55, xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1"
66, sdkVer ? stdenv.targetPlatform.sdkVer or "10.10" }:
@@ -14,20 +14,20 @@ let
1414 sdkBuildVersion = "17E189";
1515 xcodeSelectVersion = "2349";
1616
17− xcbuild = buildPackages.callPackage ./default.nix {
18− inherit CoreServices ImageIO CoreGraphics;
17+ xcbuild = callPackage ./default.nix {
18+ inherit CoreServices ImageIO CoreGraphics stdenv;
1919 };
2020
21− toolchains = buildPackages.callPackage ./toolchains.nix {
22− inherit toolchainName;
21+ toolchains = callPackage ./toolchains.nix {
22+ inherit toolchainName stdenv;
2323 };
2424
25− sdks = buildPackages.callPackage ./sdks.nix {
25+ sdks = callPackage ./sdks.nix {
2626 inherit toolchainName sdkName xcodePlatform;
2727 version = sdkVer;
2828 };
2929
30− platforms = buildPackages.callPackage ./platforms.nix {
30+ platforms = callPackage ./platforms.nix {
3131 inherit sdks xcodePlatform;
3232 };
3333
pkgs/development/web/nodejs/v12.nixnew file+10
@@ -0,0 +1,10 @@
1+{ stdenv, callPackage, lib, openssl, enableNpm ? true }:
2+
3+let
4+ buildNodejs = callPackage ./nodejs.nix { inherit openssl; };
5+in
6+ buildNodejs {
7+ inherit enableNpm;
8+ version = "12.1.0";
9+ sha256 = "1efb792c689fed2e028025e1398e84193281f329427a17a62b0bffee8e771395";
10+ }
pkgs/games/gargoyle/darwin.patchdeleted−64
@@ -1,64 +0,0 @@
1−--- a/garglk/fontmac.m
2−+++ b/garglk/fontmac.m
3−@@ -167,7 +167,7 @@ static void propfont(char *file, int style)
4− }
5− }
6−
7−-static NSMutableArray<NSURL *> * gli_registered_fonts = nil;
8−+static NSMutableArray * gli_registered_fonts = nil;
9− static NSDistributedLock * gli_font_lock = nil;
10−
11− void fontreplace(char *font, int type)
12−@@ -181,7 +181,7 @@ void fontreplace(char *font, int type)
13− NSFontDescriptor * fontFamilyDescriptor =
14− [[NSFontDescriptor fontDescriptorWithFontAttributes: nil] fontDescriptorWithFamily: fontFamily];
15−
16−- NSArray<NSFontDescriptor *> * fontMatches =
17−+ NSArray * fontMatches =
18− [fontFamilyDescriptor matchingFontDescriptorsWithMandatoryKeys: nil];
19−
20− for (NSFontDescriptor * sysfont in fontMatches)
21−@@ -259,7 +259,7 @@ void fontload(void)
22−
23− // obtain a list of all files in the Fonts directory
24− NSString * fontFolder = [[NSString stringWithUTF8String: env] stringByAppendingPathComponent: @"Fonts"];
25−- NSArray<NSString *> * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil];
26−+ NSArray * fontFiles = [[NSFileManager defaultManager] contentsOfDirectoryAtPath: fontFolder error: nil];
27−
28− // create a collection to hold the registered font URLs
29− gli_registered_fonts = [NSMutableArray new];
30−--- a/garglk/launchmac.m
31−+++ b/garglk/launchmac.m
32−@@ -556,7 +556,7 @@ static BOOL isTextbufferEvent(NSEvent * evt)
33− <GargoyleApp, NSApplicationDelegate, NSWindowDelegate>
34− {
35− BOOL openedFirstGame;
36−- NSMutableDictionary<NSNumber *, GargoyleWindow *> * windows;
37−+ NSMutableDictionary * windows;
38− NSConnection * link;
39− }
40− - (BOOL) launchFile: (NSString *) file;
41−--- a/garglk/ttsmac.m
42−+++ b/garglk/ttsmac.m
43−@@ -30,7 +30,7 @@
44− #import "sysmac.h"
45−
46− // a queue of phrases to feed to the speech synthesizer
47−-static NSMutableArray<NSString *> * phraseQueue = nil;
48−+static NSMutableArray * phraseQueue = nil;
49− static NSRange purgeRange;
50−
51− @interface SpeechDelegate : NSObject <NSSpeechSynthesizerDelegate>
52−@@ -96,10 +96,10 @@ void gli_initialize_tts(void)
53− NSString * lang = [NSString stringWithCString: gli_conf_speak_language
54− encoding: NSUTF8StringEncoding];
55−
56−- NSArray<NSString *> * voices = [NSSpeechSynthesizer availableVoices];
57−+ NSArray * voices = [NSSpeechSynthesizer availableVoices];
58− for (NSString * voice in voices)
59− {
60−- NSDictionary<NSString *, id> * attr = [NSSpeechSynthesizer attributesForVoice: voice];
61−+ NSDictionary * attr = [NSSpeechSynthesizer attributesForVoice: voice];
62− if ([lang isEqualToString: [attr objectForKey: NSVoiceLocaleIdentifier]])
63− {
64− [synth setVoice: voice];
pkgs/games/gargoyle/default.nix−2
@@ -34,8 +34,6 @@ stdenv.mkDerivation {
3434 buildInputs = [ SDL SDL_mixer SDL_sound gtk2 ]
3535 ++ stdenv.lib.optionals stdenv.isDarwin [ cf-private smpeg libvorbis ];
3636
37− patches = [ ./darwin.patch ];
38−
3937 buildPhase = jamenv + "jam -j$NIX_BUILD_CORES";
4038
4139 installPhase =
pkgs/games/quake2/yquake2/default.nix+2
@@ -3,6 +3,7 @@
33, oggSupport ? true, libogg, libvorbis
44, openalSupport ? true, openal
55, zipSupport ? true, zlib
6+, Cocoa, OpenAL
67}:
78
89let
@@ -28,6 +29,7 @@ let
2829 nativeBuildInputs = [ cmake ];
2930
3031 buildInputs = [ SDL2 libGL ]
32+ ++ lib.optionals stdenv.isDarwin [ Cocoa OpenAL ]
3133 ++ lib.optionals oggSupport [ libogg libvorbis ]
3234 ++ lib.optional openalSupport openal
3335 ++ lib.optional zipSupport zlib;
pkgs/misc/jackaudio/darwin-cf.patchdeleted−49
@@ -1,49 +0,0 @@
1−diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp
2−index 7eea281..4b8d75d 100644
3−--- a/common/Jackdmp.cpp
4−+++ b/common/Jackdmp.cpp
5−@@ -50,43 +50,11 @@ are "hard-coded" in the source. A much better approach would be to use the contr
6− - get available drivers and their possible parameters, then prepare to parse them.
7− */
8−
9−-#ifdef __APPLE__
10−-#include <CoreFoundation/CFNotificationCenter.h>
11−-#include <CoreFoundation/CoreFoundation.h>
12−-
13−-static void notify_server_start(const char* server_name)
14−-{
15−- // Send notification to be used in the JackRouter plugin
16−- CFStringRef ref = CFStringCreateWithCString(NULL, server_name, kCFStringEncodingMacRoman);
17−- CFNotificationCenterPostNotificationWithOptions(CFNotificationCenterGetDistributedCenter(),
18−- CFSTR("com.grame.jackserver.start"),
19−- ref,
20−- NULL,
21−- kCFNotificationDeliverImmediately | kCFNotificationPostToAllSessions);
22−- CFRelease(ref);
23−-}
24−-
25−-static void notify_server_stop(const char* server_name)
26−-{
27−- // Send notification to be used in the JackRouter plugin
28−- CFStringRef ref1 = CFStringCreateWithCString(NULL, server_name, kCFStringEncodingMacRoman);
29−- CFNotificationCenterPostNotificationWithOptions(CFNotificationCenterGetDistributedCenter(),
30−- CFSTR("com.grame.jackserver.stop"),
31−- ref1,
32−- NULL,
33−- kCFNotificationDeliverImmediately | kCFNotificationPostToAllSessions);
34−- CFRelease(ref1);
35−-}
36−-
37−-#else
38−-
39− static void notify_server_start(const char* server_name)
40− {}
41− static void notify_server_stop(const char* server_name)
42− {}
43−
44−-#endif
45−-
46− static void copyright(FILE* file)
47− {
48− fprintf(file, "jackdmp " VERSION "\n"
49−
pkgs/misc/jackaudio/default.nix+11−12
@@ -1,8 +1,9 @@
11{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
2+, fetchpatch
23, bash, libsamplerate, libsndfile, readline, eigen, celt
3−, wafHook
4+, wafHook, aften
45# Darwin Dependencies
5−, aften, AudioToolbox, CoreAudio, CoreFoundation
6+, AudioUnit, CoreAudio, cf-private, libobjc, Accelerate
67
78# Optional Dependencies
89, dbus ? null, libffado ? null, alsaLib ? null
@@ -39,22 +40,20 @@ stdenv.mkDerivation rec {
3940 nativeBuildInputs = [ pkgconfig python makeWrapper wafHook ];
4041 buildInputs = [ libsamplerate libsndfile readline eigen celt
4142 optDbus optPythonDBus optLibffado optAlsaLib optLibopus
42− ] ++ optionals stdenv.isDarwin [ aften AudioToolbox CoreAudio CoreFoundation ];
43−
44− # CoreFoundation 10.10 doesn't include CFNotificationCenter.h yet.
45− patches = optionals stdenv.isDarwin [ ./darwin-cf.patch ];
43+ aften
44+ ] ++ optionals stdenv.isDarwin [
45+ AudioUnit CoreAudio Accelerate cf-private libobjc
46+ ];
4647
4748 prePatch = ''
4849 substituteInPlace svnversion_regenerate.sh \
4950 --replace /bin/bash ${bash}/bin/bash
5051 '';
5152
52− # It looks like one of the frameworks depends on <CoreFoundation/CFAttributedString.h>
53− # since frameworks are impure we also have to use the impure CoreFoundation here.
54− # FIXME: remove when CoreFoundation is updated to 10.11
55− preConfigure = optionalString stdenv.isDarwin ''
56− export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE"
57− '';
53+ patches = [ (fetchpatch {
54+ url = "https://github.com/jackaudio/jack2/commit/d851fada460d42508a6f82b19867f63853062583.patch";
55+ sha256 = "1iwwxjzvgrj7dz3s8alzlhcgmcarjcbkrgvsmy6kafw21pyyw7hp";
56+ }) ];
5857
5958 wafConfigureFlags = [
6059 "--classic"
pkgs/os-specific/darwin/apple-sdk/default.nix+9−29
@@ -1,30 +1,22 @@
1−{ stdenv, fetchurl, xar, xz, cpio, pkgs, python, lib }:
1+{ stdenv, fetchurl, xar, cpio, pkgs, python, pbzx, lib }:
22
33let
4− # TODO: make this available to other packages and generalize the unpacking a bit
5− # from https://gist.github.com/pudquick/ff412bcb29c9c1fa4b8d
6− # This isn't needed until we get to SDK 10.11, but that presents other challenges
7− # unpbzx = fetchurl {
8− # url = "https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py";
9− # sha256 = "0jgp6qbfl36i0jlz7as5zk2w20z4ca8wlrhdw49lwsld6wi3rfhc";
10− # };
11−
124 # sadly needs to be exported because security_tool needs it
135 sdk = stdenv.mkDerivation rec {
14− version = "10.10";
6+ version = "10.12";
157 name = "MacOS_SDK-${version}";
168
17− # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.10.merged-1.sucatalog, which we found by:
9+ # This URL comes from https://swscan.apple.com/content/catalogs/others/index-10.12.merged-1.sucatalog, which we found by:
1810 # 1. Google: site:swscan.apple.com and look for a name that seems appropriate for your version
1911 # 2. In the resulting file, search for a file called DevSDK ending in .pkg
2012 # 3. ???
2113 # 4. Profit
2214 src = fetchurl {
23− url = "http://swcdn.apple.com/content/downloads/22/52/031-45139/hcjjv7cm4n6yqk56ict73qqw15ikm5iaql/DevSDK_OSX1010.pkg";
24− sha256 = "08bxa93zw7r4vzs28j9giq2qyk3b68ky6jx1bb9850gflr3nvgq1";
15+ url = "http://swcdn.apple.com/content/downloads/28/09/091-29862/pafhn2u002b9slnrxzy9p86rpedycnjhb5/DevSDK_OSX1012.pkg";
16+ sha256 = "1sggc70rypqwcjwr7ciavw8sczwll16cwqxdxrbw7r2qvy3b0nhx";
2517 };
2618
27− buildInputs = [ xar xz cpio python ];
19+ buildInputs = [ xar cpio python pbzx ];
2820
2921 phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
3022 outputs = [ "out" "dev" "man" ];
@@ -37,7 +29,7 @@ let
3729 start="$(pwd)"
3830 mkdir -p $out
3931 cd $out
40− cat $start/Payload | gzip -d | cpio -idm
32+ pbzx -n $start/Payload | cpio -idm
4133
4234 mv usr/* .
4335 rmdir usr
@@ -48,12 +40,6 @@ let
4840 pushd lib
4941 ln -s -L /usr/lib/libcups*.dylib .
5042 popd
51−
52− cd Library/Frameworks/QuartzCore.framework/Versions/A/Headers
53− for file in CI*.h; do
54− rm $file
55− ln -s ../Frameworks/CoreImage.framework/Headers/$file
56− done
5743 '';
5844
5945 meta = with stdenv.lib; {
@@ -88,13 +74,12 @@ let
8874
8975 # Keep track of if this is a child or a child rescue as with
9076 # ApplicationServices in the 10.9 SDK
91− local isChild
77+ local isChild=0
9278
9379 if [ -d "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" ]; then
9480 isChild=1
9581 cp -R "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" .
96− else
97− isChild=0
82+ elif [ -d "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" ]; then
9883 current="$(readlink "/System/Library/Frameworks/$name.framework/Versions/Current")"
9984 cp -R "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" .
10085 fi
@@ -111,11 +96,6 @@ let
11196 pushd "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current" >/dev/null
11297 fi
11398 local children=$(echo Frameworks/*.framework)
114− if [ "$name" == "ApplicationServices" ]; then
115− # Fixing up ApplicationServices which is missing
116− # CoreGraphics in the 10.9 SDK
117− children="$children Frameworks/CoreGraphics.framework"
118− fi
11999 popd >/dev/null
120100
121101 for child in $children; do
pkgs/os-specific/darwin/apple-sdk/frameworks.nix+10−10
@@ -10,12 +10,12 @@ with frameworks; with libs; {
1010 AVKit = [];
1111 Accounts = [];
1212 AddressBook = [ Carbon CF ];
13− AppKit = [ AudioToolbox Foundation QuartzCore ];
13+ AppKit = [ AudioToolbox AudioUnit Foundation QuartzCore ];
1414 AppKitScripting = [];
1515 AppleScriptKit = [];
1616 AppleScriptObjC = [];
17− AudioToolbox = [ AudioUnit CoreAudio CF CoreMIDI ];
18− AudioUnit = [ Carbon CoreAudio CF ];
17+ AudioToolbox = [ CoreAudio CF CoreMIDI ];
18+ AudioUnit = [ AudioToolbox Carbon CoreAudio CF ];
1919 AudioVideoBridging = [ Foundation ];
2020 Automator = [];
2121 CFNetwork = [ CF ];
@@ -29,26 +29,25 @@ with frameworks; with libs; {
2929 CoreAudioKit = [ AudioUnit ];
3030 CoreData = [];
3131 CoreGraphics = [ Accelerate CF IOKit IOSurface SystemConfiguration ];
32+ CoreImage = [ ];
3233 CoreLocation = [];
3334 CoreMIDI = [ CF ];
3435 CoreMIDIServer = [];
35− CoreMedia = [ ApplicationServices AudioToolbox CoreAudio CF CoreGraphics CoreVideo ];
36+ CoreMedia = [ ApplicationServices AudioToolbox AudioUnit CoreAudio CF CoreGraphics CoreVideo ];
3637 CoreMediaIO = [ CF CoreMedia ];
3738 CoreText = [ CF CoreGraphics ];
3839 CoreVideo = [ ApplicationServices CF CoreGraphics IOSurface OpenGL ];
3940 CoreWLAN = [ SecurityFoundation ];
40− DVComponentGlue = [ CoreServices QuickTime ];
4141 DVDPlayback = [];
4242 DirectoryService = [ CF ];
4343 DiscRecording = [ CF CoreServices IOKit ];
4444 DiscRecordingUI = [];
4545 DiskArbitration = [ CF IOKit ];
46− DrawSprocket = [ Carbon ];
4746 EventKit = [];
4847 ExceptionHandling = [];
4948 FWAUserLib = [];
5049 ForceFeedback = [ CF IOKit ];
51− Foundation = [ CF libobjc Security ApplicationServices SystemConfiguration ];
50+ Foundation = [ cf-private libobjc Security ApplicationServices SystemConfiguration ];
5251 GLKit = [ CF ];
5352 GLUT = [ OpenGL ];
5453 GSS = [];
@@ -73,7 +72,8 @@ with frameworks; with libs; {
7372 LatentSemanticMapping = [ Carbon CF ];
7473 MapKit = [];
7574 MediaAccessibility = [ CF CoreGraphics CoreText QuartzCore ];
76− MediaToolbox = [ AudioToolbox CF CoreMedia ];
75+ MediaToolbox = [ AudioToolbox AudioUnit CF CoreMedia ];
76+ Metal = [];
7777 NetFS = [ CF ];
7878 OSAKit = [ Carbon ];
7979 OpenAL = [];
@@ -84,7 +84,6 @@ with frameworks; with libs; {
8484 PubSub = [];
8585 QTKit = [ CoreMediaIO CoreMedia MediaToolbox QuickTime VideoToolbox ];
8686 QuickLook = [ ApplicationServices CF ];
87− QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ];
8887 SceneKit = [];
8988 ScreenSaver = [];
9089 Scripting = [];
@@ -114,7 +113,8 @@ with frameworks; with libs; {
114113 JavaVM = [];
115114 OpenDirectory = [];
116115 Quartz = [ QuickLook QTKit ];
117− QuartzCore = [ ApplicationServices CF CoreVideo OpenCL ];
116+ QuartzCore = [ ApplicationServices CF CoreVideo OpenCL CoreImage Metal ];
117+ QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ];
118118
119119 vmnet = [];
120120}
pkgs/os-specific/darwin/apple-source-releases/Libc/CrashReporterClient.hnew file+51
@@ -0,0 +1,51 @@
1+/*
2+ * Copyright (c) 2010 Apple Inc. All rights reserved.
3+ *
4+ * @APPLE_LICENSE_HEADER_START@
5+ *
6+ * This file contains Original Code and/or Modifications of Original Code
7+ * as defined in and that are subject to the Apple Public Source License
8+ * Version 2.0 (the 'License'). You may not use this file except in
9+ * compliance with the License. Please obtain a copy of the License at
10+ * http://www.opensource.apple.com/apsl/ and read it before using this
11+ * file.
12+ *
13+ * The Original Code and all software distributed under the License are
14+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
15+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
16+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
17+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
18+ * Please see the License for the specific language governing rights and
19+ * limitations under the License.
20+ *
21+ * @APPLE_LICENSE_HEADER_END@
22+ */
23+
24+/***********************************************************************
25+ * Not to be installed in /usr/local/include
26+ ***********************************************************************/
27+
28+#ifndef _LIBC_CRASHREPORTERCLIENT_H
29+#define _LIBC_CRASHREPORTERCLIENT_H
30+
31+#include "stdint.h"
32+
33+/* Fake the CrashReporterClient API */
34+#define CRGetCrashLogMessage() 0
35+#define CRSetCrashLogMessage(m) true
36+
37+#define CRASH_REPORTER_CLIENT_HIDDEN __attribute__((visibility("hidden")))
38+#define CRASHREPORTER_ANNOTATIONS_VERSION 4
39+#define CRASHREPORTER_ANNOTATIONS_SECTION "__crash_info"
40+
41+struct crashreporter_annotations_t {
42+ uint64_t version; // unsigned long
43+ uint64_t message; // char *
44+ uint64_t signature_string; // char *
45+ uint64_t backtrace; // char *
46+ uint64_t message2; // char *
47+ uint64_t thread; // uint64_t
48+ uint64_t dialog_mode; // unsigned int
49+};
50+
51+#endif
pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix+2
@@ -11,6 +11,8 @@ appleDerivation {
1111 export PRIVATE_HEADERS_FOLDER_PATH=include
1212 bash xcodescripts/headers.sh
1313
14+ cp ${./CrashReporterClient.h} $out/include/CrashReporterClient.h
15+
1416 cp ${Libc_10-9}/include/NSSystemDirectories.h $out/include
1517
1618 # Ugh Apple stopped releasing this stuff so we need an older one...
pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix+39−8
@@ -1,9 +1,11 @@
1−{ stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo,
2− dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto, copyfile,
3− removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil }:
1+{ stdenv, appleDerivation, cpio, xnu, Libc, Libm, libdispatch, cctools, Libinfo
2+, dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto
3+, copyfile, removefile, libresolv, Libnotify, libplatform, libpthread
4+, mDNSResponder, launchd, libutil, hfs, darling }:
45
56appleDerivation rec {
6− phases = [ "unpackPhase" "installPhase" ];
7+ dontBuild = true;
8+ dontFixup = true;
79
810 nativeBuildInputs = [ cpio ];
911
@@ -17,19 +19,48 @@ appleDerivation rec {
1719 cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/Availability*.h $out/include
1820 cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/stdarg.h $out/include
1921
20− for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \
21− ${libdispatch} ${ncurses.dev} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \
22− ${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do
22+ for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} \
23+ ${libclosure} ${CarbonHeaders} ${libdispatch} ${ncurses.dev} \
24+ ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \
25+ ${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} \
26+ ${libutil} ${libpthread} ${hfs}; do
2327 (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include)
2428 done
2529
26−
2730 (cd ${cctools.dev}/include/mach-o && find . -name '*.h' | cpio -pdm $out/include/mach-o)
2831
32+ mkdir -p $out/include/os
33+
34+ cp ${darling.src}/src/libc/os/activity.h $out/include/os
35+ cp ${darling.src}/src/libc/os/log.h $out/include/os
36+ cp ${darling.src}/src/duct/include/os/trace.h $out/include/os
37+
38+ cat <<EOF > $out/include/os/availability.h
39+ #ifndef __OS_AVAILABILITY__
40+ #define __OS_AVAILABILITY__
41+ #include <AvailabilityInternal.h>
42+
43+ #if defined(__has_feature) && defined(__has_attribute) && __has_attribute(availability)
44+ #define API_AVAILABLE(...) __API_AVAILABLE_GET_MACRO(__VA_ARGS__, __API_AVAILABLE4, __API_AVAILABLE3, __API_AVAILABLE2, __API_AVAILABLE1)(__VA_ARGS__)
45+ #define API_DEPRECATED(...) __API_DEPRECATED_MSG_GET_MACRO(__VA_ARGS__, __API_DEPRECATED_MSG5, __API_DEPRECATED_MSG4, __API_DEPRECATED_MSG3, __API_DEPRECATED_MSG2, __API_DEPRECATED_MSG1)(__VA_ARGS__)
46+ #define API_DEPRECATED_WITH_REPLACEMENT(...) __API_DEPRECATED_REP_GET_MACRO(__VA_ARGS__, __API_DEPRECATED_REP5, __API_DEPRECATED_REP4, __API_DEPRECATED_REP3, __API_DEPRECATED_REP2, __API_DEPRECATED_REP1)(__VA_ARGS__)
47+ #define API_UNAVAILABLE(...) __API_UNAVAILABLE_GET_MACRO(__VA_ARGS__, __API_UNAVAILABLE3, __API_UNAVAILABLE2, __API_UNAVAILABLE1)(__VA_ARGS__)
48+ #else
49+
50+ #define API_AVAILABLE(...)
51+ #define API_DEPRECATED(...)
52+ #define API_DEPRECATED_WITH_REPLACEMENT(...)
53+ #define API_UNAVAILABLE(...)
54+
55+ #endif
56+ #endif
57+ EOF
58+
2959 cat <<EOF > $out/include/TargetConditionals.h
3060 #ifndef __TARGETCONDITIONALS__
3161 #define __TARGETCONDITIONALS__
3262 #define TARGET_OS_MAC 1
63+ #define TARGET_OS_OSX 1
3364 #define TARGET_OS_WIN32 0
3465 #define TARGET_OS_UNIX 0
3566 #define TARGET_OS_EMBEDDED 0
pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols+27
@@ -232,6 +232,8 @@ __os_assert_log_ctx
232232__os_assumes_log
233233__os_assumes_log_ctx
234234__os_avoid_tail_call
235+__os_crash
236+__os_crash_callback
235237__os_debug_log
236238__os_debug_log_error_str
237239__putenvp
@@ -263,6 +265,7 @@ __unsetenvp
263265__utmpxname
264266_a64l
265267_abort
268+_abort_report_np
266269_abs
267270_acl_add_flag_np
268271_acl_add_perm
@@ -345,6 +348,7 @@ _backtrace
345348_backtrace_symbols
346349_backtrace_symbols_fd
347350_basename
351+_basename_r
348352_bcmp
349353_bcopy
350354_brk
@@ -377,8 +381,12 @@ _chmodx_np
377381_clearerr
378382_clearerr_unlocked
379383_clock
384+_clock_getres
385+_clock_gettime
386+_clock_gettime_nsec_np
380387_clock_port
381388_clock_sem
389+_clock_settime
382390_closedir
383391_compat_mode
384392_confstr
@@ -411,6 +419,7 @@ _digittoint
411419_digittoint_l
412420_dirfd
413421_dirname
422+_dirname_r
414423_div
415424_dprintf
416425_dprintf_l
@@ -771,8 +780,12 @@ _mergesort_b
771780_mkdirx_np
772781_mkdtemp
773782_mkfifox_np
783+_mkostemp
784+_mkostemps
774785_mkpath_np
786+_mkpathat_np
775787_mkstemp
788+_mkstemp_dprotected_np
776789_mkstemps
777790_mktemp
778791_mktime
@@ -805,6 +818,7 @@ _nice
805818_nl_langinfo
806819_nl_langinfo_l
807820_nrand48
821+_nvis
808822_off32
809823_off64
810824_offtime
@@ -959,6 +973,7 @@ _sleep
959973_sleep$NOCANCEL
960974_snprintf
961975_snprintf_l
976+_snvis
962977_sockatmark
963978_sprintf
964979_sprintf_l
@@ -988,6 +1003,7 @@ _strcoll_l
9881003_strcpy
9891004_strcspn
9901005_strdup
1006+_strenvisx
9911007_strerror
9921008_strerror_r
9931009_strfmon
@@ -1006,14 +1022,23 @@ _strncpy
10061022_strndup
10071023_strnlen
10081024_strnstr
1025+_strnunvis
1026+_strnunvisx
1027+_strnvis
1028+_strnvisx
10091029_strpbrk
10101030_strptime
10111031_strptime_l
10121032_strrchr
1033+_strsenvisx
10131034_strsep
10141035_strsignal
1036+_strsnvis
1037+_strsnvisx
10151038_strspn
10161039_strstr
1040+_strsvis
1041+_strsvisx
10171042_strtod
10181043_strtod_l
10191044_strtof
@@ -1046,6 +1071,7 @@ _strvisx
10461071_strxfrm
10471072_strxfrm_l
10481073_suboptarg
1074+_svis
10491075_swab
10501076_swprintf
10511077_swprintf_l
@@ -1087,6 +1113,7 @@ _timelocal
10871113_timeoff
10881114_times
10891115_timezone
1116+_timingsafe_bcmp
10901117_tmpfile
10911118_tmpnam
10921119_toascii
pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols+158
@@ -3,6 +3,7 @@ _____old_semwait_signal_nocancel
33_____sigwait_nocancel
44____kernelVersionNumber
55____kernelVersionString
6+___abort_with_payload
67___accept
78___accept_nocancel
89___access_extended
@@ -13,6 +14,11 @@ ___bsdthread_ctl
1314___bsdthread_register
1415___bsdthread_terminate
1516___carbon_delete
17+___channel_get_info
18+___channel_get_opt
19+___channel_open
20+___channel_set_opt
21+___channel_sync
1622___chmod
1723___chmod_extended
1824___close_nocancel
@@ -32,6 +38,7 @@ ___fchmod_extended
3238___fcntl
3339___fcntl_nocancel
3440___fork
41+___fs_snapshot
3542___fstat64_extended
3643___fstat_extended
3744___fsync_nocancel
@@ -57,6 +64,8 @@ ___ioctl
5764___iopolicysys
5865___kdebug_trace
5966___kdebug_trace64
67+___kdebug_trace_string
68+___kdebug_typefilter
6069___kill
6170___lchown
6271___libkernel_init
@@ -79,6 +88,7 @@ ___mac_set_file
7988___mac_set_link
8089___mac_set_proc
8190___mac_syscall
91+___microstackshot
8292___mkdir_extended
8393___mkfifo_extended
8494___mmap
@@ -90,6 +100,13 @@ ___msgsys
90100___msync
91101___msync_nocancel
92102___munmap
103+___nexus_create
104+___nexus_deregister
105+___nexus_destroy
106+___nexus_get_opt
107+___nexus_open
108+___nexus_register
109+___nexus_set_opt
93110___old_semwait_signal
94111___open
95112___open_dprotected_np
@@ -97,12 +114,17 @@ ___open_extended
97114___open_nocancel
98115___openat
99116___openat_nocancel
117+___os_nexus_ifattach
118+___os_nexus_ifdetach
119+___persona
100120___pipe
101121___poll_nocancel
102122___posix_spawn
103123___pread_nocancel
104124___proc_info
105125___process_policy
126+___pselect
127+___pselect_nocancel
106128___psynch_cvbroad
107129___psynch_cvclrprepost
108130___psynch_cvsignal
@@ -133,6 +155,7 @@ ___recvmsg
133155___recvmsg_nocancel
134156___rename
135157___renameat
158+___renameatx_np
136159___rmdir
137160___sandbox_me
138161___sandbox_mm
@@ -175,6 +198,7 @@ ___sigsuspend
175198___sigsuspend_nocancel
176199___sigwait
177200___socketpair
201+___stack_snapshot_with_config
178202___stat64_extended
179203___stat_extended
180204___syscall
@@ -182,8 +206,11 @@ ___syscall_logger
182206___sysctl
183207___sysctlbyname
184208___telemetry
209+___terminate_with_payload
185210___thread_selfid
186211___thread_selfusage
212+___ulock_wait
213+___ulock_wake
187214___umask_extended
188215___unlink
189216___unlinkat
@@ -191,6 +218,7 @@ ___vfork
191218___wait4
192219___wait4_nocancel
193220___waitid_nocancel
221+___work_interval_ctl
194222___workq_kernreturn
195223___workq_open
196224___write_nocancel
@@ -202,6 +230,7 @@ __get_cpu_capabilities
202230__getprivatesystemidentifier
203231__host_page_size
204232__init_cpu_capabilities
233+__kernelrpc_host_create_mach_voucher
205234__kernelrpc_mach_port_allocate
206235__kernelrpc_mach_port_allocate_full
207236__kernelrpc_mach_port_allocate_name
@@ -257,13 +286,17 @@ __kernelrpc_mach_vm_map
257286__kernelrpc_mach_vm_map_trap
258287__kernelrpc_mach_vm_protect
259288__kernelrpc_mach_vm_protect_trap
289+__kernelrpc_mach_vm_purgable_control
290+__kernelrpc_mach_vm_purgable_control_trap
260291__kernelrpc_mach_vm_read
261292__kernelrpc_mach_vm_remap
293+__kernelrpc_mach_voucher_extract_attr_recipe
262294__kernelrpc_task_set_port_space
263295__kernelrpc_thread_policy
264296__kernelrpc_thread_policy_set
265297__kernelrpc_thread_set_policy
266298__kernelrpc_vm_map
299+__kernelrpc_vm_purgable_control
267300__kernelrpc_vm_read
268301__kernelrpc_vm_remap
269302__mach_errors
@@ -272,6 +305,9 @@ __mach_snprintf
272305__mach_vsnprintf
273306__os_alloc_once_table
274307__register_gethostuuid_callback
308+__thread_set_tsd_base
309+_abort_with_payload
310+_abort_with_reason
275311_accept
276312_accept$NOCANCEL
277313_access
@@ -312,6 +348,8 @@ _clock_set_attributes
312348_clock_set_time
313349_clock_sleep
314350_clock_sleep_trap
351+_clonefile
352+_clonefileat
315353_close
316354_close$NOCANCEL
317355_coalition_create
@@ -345,6 +383,7 @@ _fchmod
345383_fchmodat
346384_fchown
347385_fchownat
386+_fclonefileat
348387_fcntl
349388_fcntl$NOCANCEL
350389_fdatasync
@@ -358,9 +397,16 @@ _flistxattr
358397_flock
359398_fpathconf
360399_fremovexattr
400+_fs_snapshot_create
401+_fs_snapshot_delete
402+_fs_snapshot_list
403+_fs_snapshot_mount
404+_fs_snapshot_rename
405+_fs_snapshot_revert
361406_fsctl
362407_fsetattrlist
363408_fsetxattr
409+_fsgetpath
364410_fstat
365411_fstat$INODE64
366412_fstat64
@@ -384,6 +430,7 @@ _getdirentries
384430_getdirentriesattr
385431_getdtablesize
386432_getegid
433+_getentropy
387434_geteuid
388435_getfh
389436_getfsstat
@@ -409,6 +456,7 @@ _getsockopt
409456_getuid
410457_getwgroups_np
411458_getxattr
459+_grab_pgo_data
412460_guarded_close_np
413461_guarded_kqueue_np
414462_guarded_open_dprotected_np
@@ -416,14 +464,18 @@ _guarded_open_np
416464_guarded_pwrite_np
417465_guarded_write_np
418466_guarded_writev_np
467+_host_check_multiuser_mode
419468_host_create_mach_voucher
469+_host_create_mach_voucher_trap
420470_host_default_memory_manager
421471_host_get_UNDServer
472+_host_get_atm_diagnostic_flag
422473_host_get_boot_info
423474_host_get_clock_control
424475_host_get_clock_service
425476_host_get_exception_ports
426477_host_get_io_master
478+_host_get_multiuser_config_flags
427479_host_get_special_port
428480_host_info
429481_host_kernel_version
@@ -443,7 +495,9 @@ _host_security_set_task_token
443495_host_self
444496_host_self_trap
445497_host_set_UNDServer
498+_host_set_atm_diagnostic_flag
446499_host_set_exception_ports
500+_host_set_multiuser_config_flags
447501_host_set_special_port
448502_host_statistics
449503_host_statistics64
@@ -456,15 +510,28 @@ _internal_catch_exc_subsystem
456510_ioctl
457511_issetugid
458512_kas_info
513+_kdebug_is_enabled
514+_kdebug_signpost
515+_kdebug_signpost_end
516+_kdebug_signpost_start
459517_kdebug_trace
518+_kdebug_trace_string
519+_kdebug_typefilter
460520_kevent
461521_kevent64
522+_kevent_qos
462523_kext_request
463524_kill
464525_kmod_control
465526_kmod_create
466527_kmod_destroy
467528_kmod_get_info
529+_kpersona_alloc
530+_kpersona_dealloc
531+_kpersona_find
532+_kpersona_get
533+_kpersona_info
534+_kpersona_pidinfo
468535_kqueue
469536_lchown
470537_ledger
@@ -487,14 +554,20 @@ _lstat$INODE64
487554_lstat64
488555_mach_absolute_time
489556_mach_approximate_time
557+_mach_boottime_usec
558+_mach_continuous_approximate_time
559+_mach_continuous_time
490560_mach_error
491561_mach_error_full_diag
492562_mach_error_string
493563_mach_error_type
564+_mach_generate_activity_id
565+_mach_get_times
494566_mach_host_self
495567_mach_init
496568_mach_make_memory_entry
497569_mach_make_memory_entry_64
570+_mach_memory_info
498571_mach_memory_object_memory_entry
499572_mach_memory_object_memory_entry_64
500573_mach_msg
@@ -554,6 +627,7 @@ _mach_task_self
554627_mach_task_self_
555628_mach_thread_self
556629_mach_timebase_info
630+_mach_timebase_info_trap
557631_mach_vm_allocate
558632_mach_vm_behavior_set
559633_mach_vm_copy
@@ -580,6 +654,7 @@ _mach_voucher_debug_info
580654_mach_voucher_extract_all_attr_recipes
581655_mach_voucher_extract_attr_content
582656_mach_voucher_extract_attr_recipe
657+_mach_voucher_extract_attr_recipe_trap
583658_mach_wait_until
584659_mach_zone_force_gc
585660_mach_zone_info
@@ -598,6 +673,7 @@ _mig_get_reply_port
598673_mig_put_reply_port
599674_mig_reply_setup
600675_mig_strncpy
676+_mig_strncpy_zerofill
601677_mincore
602678_minherit
603679_mk_timer_arm
@@ -630,7 +706,10 @@ _msync$NOCANCEL
630706_munlock
631707_munlockall
632708_munmap
709+_necp_client_action
633710_necp_match_policy
711+_necp_open
712+_netagent_trigger
634713_netname_check_in
635714_netname_check_out
636715_netname_look_up
@@ -645,6 +724,44 @@ _open_dprotected_np
645724_openat
646725_openat$NOCANCEL
647726_openbyid_np
727+_os_channel_advance_slot
728+_os_channel_attr_clone
729+_os_channel_attr_create
730+_os_channel_attr_destroy
731+_os_channel_attr_get
732+_os_channel_attr_get_key
733+_os_channel_attr_set
734+_os_channel_attr_set_key
735+_os_channel_available_slot_count
736+_os_channel_create
737+_os_channel_create_extended
738+_os_channel_destroy
739+_os_channel_get_fd
740+_os_channel_get_next_slot
741+_os_channel_pending
742+_os_channel_read_attr
743+_os_channel_read_nexus_extension_info
744+_os_channel_ring_id
745+_os_channel_rx_ring
746+_os_channel_set_slot_properties
747+_os_channel_sync
748+_os_channel_tx_ring
749+_os_channel_write_attr
750+_os_nexus_attr_clone
751+_os_nexus_attr_create
752+_os_nexus_attr_destroy
753+_os_nexus_attr_get
754+_os_nexus_attr_set
755+_os_nexus_controller_alloc_provider_instance
756+_os_nexus_controller_bind_provider_instance
757+_os_nexus_controller_create
758+_os_nexus_controller_deregister_provider
759+_os_nexus_controller_destroy
760+_os_nexus_controller_free_provider_instance
761+_os_nexus_controller_get_fd
762+_os_nexus_controller_read_provider_attr
763+_os_nexus_controller_register_provider
764+_os_nexus_controller_unbind_provider_instance
648765_panic
649766_panic_init
650767_pathconf
@@ -669,6 +786,7 @@ _posix_spawn_file_actions_addopen
669786_posix_spawn_file_actions_destroy
670787_posix_spawn_file_actions_init
671788_posix_spawnattr_destroy
789+_posix_spawnattr_get_darwin_role_np
672790_posix_spawnattr_get_qos_clamp_np
673791_posix_spawnattr_getbinpref_np
674792_posix_spawnattr_getcpumonitor
@@ -680,7 +798,12 @@ _posix_spawnattr_getprocesstype_np
680798_posix_spawnattr_getsigdefault
681799_posix_spawnattr_getsigmask
682800_posix_spawnattr_init
801+_posix_spawnattr_set_darwin_role_np
683802_posix_spawnattr_set_importancewatch_port_np
803+_posix_spawnattr_set_persona_gid_np
804+_posix_spawnattr_set_persona_groups_np
805+_posix_spawnattr_set_persona_np
806+_posix_spawnattr_set_persona_uid_np
684807_posix_spawnattr_set_qos_clamp_np
685808_posix_spawnattr_setauditsessionport_np
686809_posix_spawnattr_setbinpref_np
@@ -689,6 +812,7 @@ _posix_spawnattr_setcpumonitor
689812_posix_spawnattr_setcpumonitor_default
690813_posix_spawnattr_setexceptionports_np
691814_posix_spawnattr_setflags
815+_posix_spawnattr_setjetsam_ext
692816_posix_spawnattr_setmacpolicyinfo_np
693817_posix_spawnattr_setpcontrol_np
694818_posix_spawnattr_setpgroup
@@ -698,6 +822,7 @@ _posix_spawnattr_setsigmask
698822_posix_spawnattr_setspecialport_np
699823_pread
700824_pread$NOCANCEL
825+_proc_clear_cpulimits
701826_proc_clear_delayidlesleep
702827_proc_clear_dirty
703828_proc_clear_vmpressure
@@ -715,8 +840,10 @@ _proc_importance_assertion_begin_with_msg
715840_proc_importance_assertion_complete
716841_proc_kmsgbuf
717842_proc_libversion
843+_proc_list_uptrs
718844_proc_listallpids
719845_proc_listchildpids
846+_proc_listcoalitions
720847_proc_listpgrppids
721848_proc_listpids
722849_proc_listpidspath
@@ -728,6 +855,7 @@ _proc_pidinfo
728855_proc_pidoriginatorinfo
729856_proc_pidpath
730857_proc_regionfilename
858+_proc_resume_cpumon
731859_proc_rlimit_control
732860_proc_set_cpumon_defaults
733861_proc_set_cpumon_params
@@ -737,6 +865,7 @@ _proc_set_dirty
737865_proc_set_owner_vmpressure
738866_proc_set_wakemon_defaults
739867_proc_set_wakemon_params
868+_proc_setcpu_percentage
740869_proc_setpcontrol
741870_proc_setthread_cpupercent
742871_proc_suppress
@@ -790,6 +919,8 @@ _removexattr
790919_rename
791920_rename_ext
792921_renameat
922+_renameatx_np
923+_renamex_np
793924_revoke
794925_rmdir
795926_searchfs
@@ -876,6 +1007,16 @@ _sigsuspend$NOCANCEL
8761007_socket
8771008_socket_delegate
8781009_socketpair
1010+_stackshot_capture_with_config
1011+_stackshot_config_create
1012+_stackshot_config_dealloc
1013+_stackshot_config_dealloc_buffer
1014+_stackshot_config_get_stackshot_buffer
1015+_stackshot_config_get_stackshot_size
1016+_stackshot_config_set_delta_timestamp
1017+_stackshot_config_set_flags
1018+_stackshot_config_set_pid
1019+_stackshot_config_set_size_hint
8791020_stat
8801021_stat$INODE64
8811022_stat64
@@ -897,18 +1038,26 @@ _task_assign
8971038_task_assign_default
8981039_task_create
8991040_task_for_pid
1041+_task_generate_corpse
9001042_task_get_assignment
1043+_task_get_dyld_image_infos
9011044_task_get_emulation_vector
9021045_task_get_exception_ports
9031046_task_get_mach_voucher
9041047_task_get_special_port
9051048_task_get_state
9061049_task_info
1050+_task_map_corpse_info
1051+_task_map_corpse_info_64
9071052_task_name_for_pid
9081053_task_policy
9091054_task_policy_get
9101055_task_policy_set
9111056_task_purgable_info
1057+_task_register_dyld_get_process_state
1058+_task_register_dyld_image_infos
1059+_task_register_dyld_set_dyld_state
1060+_task_register_dyld_shared_cache_image_info
9121061_task_resume
9131062_task_resume2
9141063_task_sample
@@ -931,7 +1080,10 @@ _task_swap_exception_ports
9311080_task_swap_mach_voucher
9321081_task_terminate
9331082_task_threads
1083+_task_unregister_dyld_image_infos
9341084_task_zone_info
1085+_terminate_with_payload
1086+_terminate_with_reason
9351087_thread_abort
9361088_thread_abort_safely
9371089_thread_assign
@@ -942,6 +1094,7 @@ _thread_depress_abort
9421094_thread_get_assignment
9431095_thread_get_exception_ports
9441096_thread_get_mach_voucher
1097+_thread_get_register_pointer_values
9451098_thread_get_special_port
9461099_thread_get_state
9471100_thread_info
@@ -968,6 +1121,7 @@ _undelete
9681121_unlink
9691122_unlinkat
9701123_unmount
1124+_usrctl
9711125_utimes
9721126_vfork
9731127_vfs_purge
@@ -1008,6 +1162,10 @@ _waitevent
10081162_waitid
10091163_waitid$NOCANCEL
10101164_watchevent
1165+_work_interval_create
1166+_work_interval_destroy
1167+_work_interval_notify
1168+_work_interval_notify_simple
10111169_write
10121170_write$NOCANCEL
10131171_writev
pkgs/os-specific/darwin/apple-source-releases/Security/boot.nixnew file+116
@@ -0,0 +1,116 @@
1+{ appleDerivation }:
2+
3+appleDerivation {
4+ phases = [ "unpackPhase" "installPhase" ];
5+
6+ __propagatedImpureHostDeps = [
7+ "/System/Library/Frameworks/Security.framework/Security"
8+ "/System/Library/Frameworks/Security.framework/Resources"
9+ "/System/Library/Frameworks/Security.framework/PlugIns"
10+ "/System/Library/Frameworks/Security.framework/XPCServices"
11+ "/System/Library/Frameworks/Security.framework/Versions"
12+ ];
13+
14+ installPhase = ''
15+ ###### IMPURITIES
16+ mkdir -p $out/Library/Frameworks/Security.framework
17+ pushd $out/Library/Frameworks/Security.framework
18+ ln -s /System/Library/Frameworks/Security.framework/Security
19+ ln -s /System/Library/Frameworks/Security.framework/Resources
20+ ln -s /System/Library/Frameworks/Security.framework/PlugIns
21+ ln -s /System/Library/Frameworks/Security.framework/XPCServices
22+ popd
23+
24+ ###### HEADERS
25+
26+ export dest=$out/Library/Frameworks/Security.framework/Headers
27+ mkdir -p $dest
28+
29+ cp libsecurity_asn1/lib/SecAsn1Coder.h $dest
30+ cp libsecurity_asn1/lib/SecAsn1Templates.h $dest
31+ cp libsecurity_asn1/lib/SecAsn1Types.h $dest
32+ cp libsecurity_asn1/lib/oidsalg.h $dest
33+ cp libsecurity_asn1/lib/oidsattr.h $dest
34+
35+ cp libsecurity_authorization/lib/AuthSession.h $dest
36+ cp libsecurity_authorization/lib/Authorization.h $dest
37+ cp libsecurity_authorization/lib/AuthorizationDB.h $dest
38+ cp libsecurity_authorization/lib/AuthorizationPlugin.h $dest
39+ cp libsecurity_authorization/lib/AuthorizationTags.h $dest
40+
41+ cp libsecurity_cms/lib/CMSDecoder.h $dest
42+ cp libsecurity_cms/lib/CMSEncoder.h $dest
43+
44+ cp libsecurity_codesigning/lib/CSCommon.h $dest
45+ cp libsecurity_codesigning/lib/CodeSigning.h $dest
46+ cp libsecurity_codesigning/lib/SecCode.h $dest
47+ cp libsecurity_codesigning/lib/SecCodeHost.h $dest
48+ cp libsecurity_codesigning/lib/SecRequirement.h $dest
49+ cp libsecurity_codesigning/lib/SecStaticCode.h $dest
50+ cp libsecurity_codesigning/lib/SecTask.h $dest
51+
52+ cp libsecurity_cssm/lib/certextensions.h $dest
53+ cp libsecurity_cssm/lib/cssm.h $dest
54+ cp libsecurity_cssm/lib/cssmaci.h $dest
55+ cp libsecurity_cssm/lib/cssmapi.h $dest
56+ cp libsecurity_cssm/lib/cssmapple.h $dest
57+ cp libsecurity_cssm/lib/cssmcli.h $dest
58+ cp libsecurity_cssm/lib/cssmconfig.h $dest
59+ cp libsecurity_cssm/lib/cssmcspi.h $dest
60+ cp libsecurity_cssm/lib/cssmdli.h $dest
61+ cp libsecurity_cssm/lib/cssmerr.h $dest
62+ cp libsecurity_cssm/lib/cssmkrapi.h $dest
63+ cp libsecurity_cssm/lib/cssmkrspi.h $dest
64+ cp libsecurity_cssm/lib/cssmspi.h $dest
65+ cp libsecurity_cssm/lib/cssmtpi.h $dest
66+ cp libsecurity_cssm/lib/cssmtype.h $dest
67+ cp libsecurity_cssm/lib/eisl.h $dest
68+ cp libsecurity_cssm/lib/emmspi.h $dest
69+ cp libsecurity_cssm/lib/emmtype.h $dest
70+ cp libsecurity_cssm/lib/oidsbase.h $dest
71+ cp libsecurity_cssm/lib/oidscert.h $dest
72+ cp libsecurity_cssm/lib/oidscrl.h $dest
73+ cp libsecurity_cssm/lib/x509defs.h $dest
74+
75+ cp libsecurity_keychain/lib/SecACL.h $dest
76+ cp libsecurity_keychain/lib/SecAccess.h $dest
77+ cp libsecurity_keychain/lib/SecBase.h $dest
78+ cp libsecurity_keychain/lib/SecCertificate.h $dest
79+ cp libsecurity_keychain/lib/SecCertificatePriv.h $dest # Private
80+ cp libsecurity_keychain/lib/SecCertificateOIDs.h $dest
81+ cp libsecurity_keychain/lib/SecIdentity.h $dest
82+ cp libsecurity_keychain/lib/SecIdentitySearch.h $dest
83+ cp libsecurity_keychain/lib/SecImportExport.h $dest
84+ cp libsecurity_keychain/lib/SecItem.h $dest
85+ cp libsecurity_keychain/lib/SecKey.h $dest
86+ cp libsecurity_keychain/lib/SecKeychain.h $dest
87+ cp libsecurity_keychain/lib/SecKeychainItem.h $dest
88+ cp libsecurity_keychain/lib/SecKeychainSearch.h $dest
89+ cp libsecurity_keychain/lib/SecPolicy.h $dest
90+ cp libsecurity_keychain/lib/SecPolicySearch.h $dest
91+ cp libsecurity_keychain/lib/SecRandom.h $dest
92+ cp libsecurity_keychain/lib/SecTrust.h $dest
93+ cp libsecurity_keychain/lib/SecTrustSettings.h $dest
94+ cp libsecurity_keychain/lib/SecTrustedApplication.h $dest
95+ cp libsecurity_keychain/lib/Security.h $dest
96+
97+ cp libsecurity_manifest/lib/SecureDownload.h $dest
98+
99+ cp libsecurity_mds/lib/mds.h $dest
100+ cp libsecurity_mds/lib/mds_schema.h $dest
101+
102+ cp libsecurity_ssl/lib/CipherSuite.h $dest
103+ cp libsecurity_ssl/lib/SecureTransport.h $dest
104+
105+ cp libsecurity_transform/lib/SecCustomTransform.h $dest
106+ cp libsecurity_transform/lib/SecDecodeTransform.h $dest
107+ cp libsecurity_transform/lib/SecDigestTransform.h $dest
108+ cp libsecurity_transform/lib/SecEncodeTransform.h $dest
109+ cp libsecurity_transform/lib/SecEncryptTransform.h $dest
110+ cp libsecurity_transform/lib/SecReadTransform.h $dest
111+ cp libsecurity_transform/lib/SecSignVerifyTransform.h $dest
112+ cp libsecurity_transform/lib/SecTransform.h $dest
113+ cp libsecurity_transform/lib/SecTransformReadTransform.h $dest
114+
115+ '';
116+}
pkgs/os-specific/darwin/apple-source-releases/Security/default.nix+11−108
@@ -1,116 +1,19 @@
1−{ appleDerivation }:
1+{ stdenv, appleDerivation, xcbuildHook, Foundation, xpc, darling, dtrace, xnu }:
22
33appleDerivation {
4− phases = [ "unpackPhase" "installPhase" ];
4+ nativeBuildInputs = [ xcbuildHook dtrace ];
5+ # buildInputs = [ Foundation xpc darling ];
6+ buildInputs = [ xpc xnu ];
57
6− __propagatedImpureHostDeps = [
7− "/System/Library/Frameworks/Security.framework/Security"
8− "/System/Library/Frameworks/Security.framework/Resources"
9− "/System/Library/Frameworks/Security.framework/PlugIns"
10− "/System/Library/Frameworks/Security.framework/XPCServices"
11− "/System/Library/Frameworks/Security.framework/Versions"
12− ];
8+ xcbuildFlags = "-target Security_frameworks_osx";
139
14− installPhase = ''
15− ###### IMPURITIES
16− mkdir -p $out/Library/Frameworks/Security.framework
17− pushd $out/Library/Frameworks/Security.framework
18− ln -s /System/Library/Frameworks/Security.framework/Security
19− ln -s /System/Library/Frameworks/Security.framework/Resources
20− ln -s /System/Library/Frameworks/Security.framework/PlugIns
21− ln -s /System/Library/Frameworks/Security.framework/XPCServices
22− popd
10+ # NIX_CFLAGS_COMPILE = "-Wno-error -I${xnu}/include/libkern -DPRIVATE -I${xnu}/Library/Frameworks/System.framework/Headers";
2311
24− ###### HEADERS
25−
26− export dest=$out/Library/Frameworks/Security.framework/Headers
27− mkdir -p $dest
28−
29− cp libsecurity_asn1/lib/SecAsn1Coder.h $dest
30− cp libsecurity_asn1/lib/SecAsn1Templates.h $dest
31− cp libsecurity_asn1/lib/SecAsn1Types.h $dest
32− cp libsecurity_asn1/lib/oidsalg.h $dest
33− cp libsecurity_asn1/lib/oidsattr.h $dest
34−
35− cp libsecurity_authorization/lib/AuthSession.h $dest
36− cp libsecurity_authorization/lib/Authorization.h $dest
37− cp libsecurity_authorization/lib/AuthorizationDB.h $dest
38− cp libsecurity_authorization/lib/AuthorizationPlugin.h $dest
39− cp libsecurity_authorization/lib/AuthorizationTags.h $dest
40−
41− cp libsecurity_cms/lib/CMSDecoder.h $dest
42− cp libsecurity_cms/lib/CMSEncoder.h $dest
43−
44− cp libsecurity_codesigning/lib/CSCommon.h $dest
45− cp libsecurity_codesigning/lib/CodeSigning.h $dest
46− cp libsecurity_codesigning/lib/SecCode.h $dest
47− cp libsecurity_codesigning/lib/SecCodeHost.h $dest
48− cp libsecurity_codesigning/lib/SecRequirement.h $dest
49− cp libsecurity_codesigning/lib/SecStaticCode.h $dest
50− cp libsecurity_codesigning/lib/SecTask.h $dest
51−
52− cp libsecurity_cssm/lib/certextensions.h $dest
53− cp libsecurity_cssm/lib/cssm.h $dest
54− cp libsecurity_cssm/lib/cssmaci.h $dest
55− cp libsecurity_cssm/lib/cssmapi.h $dest
56− cp libsecurity_cssm/lib/cssmapple.h $dest
57− cp libsecurity_cssm/lib/cssmcli.h $dest
58− cp libsecurity_cssm/lib/cssmconfig.h $dest
59− cp libsecurity_cssm/lib/cssmcspi.h $dest
60− cp libsecurity_cssm/lib/cssmdli.h $dest
61− cp libsecurity_cssm/lib/cssmerr.h $dest
62− cp libsecurity_cssm/lib/cssmkrapi.h $dest
63− cp libsecurity_cssm/lib/cssmkrspi.h $dest
64− cp libsecurity_cssm/lib/cssmspi.h $dest
65− cp libsecurity_cssm/lib/cssmtpi.h $dest
66− cp libsecurity_cssm/lib/cssmtype.h $dest
67− cp libsecurity_cssm/lib/eisl.h $dest
68− cp libsecurity_cssm/lib/emmspi.h $dest
69− cp libsecurity_cssm/lib/emmtype.h $dest
70− cp libsecurity_cssm/lib/oidsbase.h $dest
71− cp libsecurity_cssm/lib/oidscert.h $dest
72− cp libsecurity_cssm/lib/oidscrl.h $dest
73− cp libsecurity_cssm/lib/x509defs.h $dest
74−
75− cp libsecurity_keychain/lib/SecACL.h $dest
76− cp libsecurity_keychain/lib/SecAccess.h $dest
77− cp libsecurity_keychain/lib/SecBase.h $dest
78− cp libsecurity_keychain/lib/SecCertificate.h $dest
79− cp libsecurity_keychain/lib/SecCertificatePriv.h $dest # Private
80− cp libsecurity_keychain/lib/SecCertificateOIDs.h $dest
81− cp libsecurity_keychain/lib/SecIdentity.h $dest
82− cp libsecurity_keychain/lib/SecIdentitySearch.h $dest
83− cp libsecurity_keychain/lib/SecImportExport.h $dest
84− cp libsecurity_keychain/lib/SecItem.h $dest
85− cp libsecurity_keychain/lib/SecKey.h $dest
86− cp libsecurity_keychain/lib/SecKeychain.h $dest
87− cp libsecurity_keychain/lib/SecKeychainItem.h $dest
88− cp libsecurity_keychain/lib/SecKeychainSearch.h $dest
89− cp libsecurity_keychain/lib/SecPolicy.h $dest
90− cp libsecurity_keychain/lib/SecPolicySearch.h $dest
91− cp libsecurity_keychain/lib/SecRandom.h $dest
92− cp libsecurity_keychain/lib/SecTrust.h $dest
93− cp libsecurity_keychain/lib/SecTrustSettings.h $dest
94− cp libsecurity_keychain/lib/SecTrustedApplication.h $dest
95− cp libsecurity_keychain/lib/Security.h $dest
96−
97− cp libsecurity_manifest/lib/SecureDownload.h $dest
98−
99− cp libsecurity_mds/lib/mds.h $dest
100− cp libsecurity_mds/lib/mds_schema.h $dest
101−
102− cp libsecurity_ssl/lib/CipherSuite.h $dest
103− cp libsecurity_ssl/lib/SecureTransport.h $dest
104−
105− cp libsecurity_transform/lib/SecCustomTransform.h $dest
106− cp libsecurity_transform/lib/SecDecodeTransform.h $dest
107− cp libsecurity_transform/lib/SecDigestTransform.h $dest
108− cp libsecurity_transform/lib/SecEncodeTransform.h $dest
109− cp libsecurity_transform/lib/SecEncryptTransform.h $dest
110− cp libsecurity_transform/lib/SecReadTransform.h $dest
111− cp libsecurity_transform/lib/SecSignVerifyTransform.h $dest
112− cp libsecurity_transform/lib/SecTransform.h $dest
113− cp libsecurity_transform/lib/SecTransformReadTransform.h $dest
12+ preBuild = ''
13+ dtrace -h -C -s OSX/libsecurity_utilities/lib/security_utilities.d -o OSX/libsecurity_utilities/lib/utilities_dtrace.h
11414
15+ xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates -target copyHeadersToSystem
16+ NIX_CFLAGS_COMPILE+=" -F./Products/Release"
17+ ln -s $PWD/Products/Release/Security.bundle/Contents $PWD/Products/Release/Security.framework
11518 '';
11619}
pkgs/os-specific/darwin/apple-source-releases/SmartCardServices/default.nixdeleted−42
@@ -1,42 +0,0 @@
1−{ stdenv, appleDerivation, xcbuildHook, gnumake, Security
2−, libsecurity_utilities, libsecurity_cdsa_utilities }:
3−
4−appleDerivation {
5− nativeBuildInputs = [ xcbuildHook ];
6− buildInputs = [ libsecurity_utilities libsecurity_cdsa_utilities ];
7−
8− DSTROOT = "$out";
9−
10− NIX_CFLAGS_COMPILE = "-I.";
11− preBuild = ''
12− mkdir -p Security
13− cp ${Security}/Library/Frameworks/Security.framework/Headers/*.h Security
14− '';
15−
16− patchPhase = ''
17− substituteInPlace SmartCardServices.xcodeproj/project.pbxproj \
18− --replace "/usr/bin/gnumake" "${gnumake}/bin/make"
19− substituteInPlace src/PCSC/PCSC.exp \
20− --replace _PCSCVersionString "" \
21− --replace _PCSCVersionNumber ""
22− substituteInPlace Makefile.installPhase \
23− --replace chown "# chown" \
24− --replace /usr/bin/ ""
25− '';
26−
27− installPhase = ''
28− make -f Makefile.installPhase install
29− make -f Makefile-exec.installPhase install
30− mv $out/usr/* $out
31− rmdir $out/usr
32−
33− mkdir -p $out/Library/Frameworks
34− cp -r Products/Release/PCSC.bundle $out/Library/Frameworks/PCSC.framework
35− '';
36−
37− meta = with stdenv.lib; {
38− maintainers = with maintainers; [ matthewbauer ];
39− platforms = platforms.darwin;
40− license = licenses.apsl20;
41− };
42−}
pkgs/os-specific/darwin/apple-source-releases/adv_cmds/boot.nixnew file+91
@@ -0,0 +1,91 @@
1+{ stdenv, appleDerivation, fetchzip, bsdmake, perl, flex, yacc
2+}:
3+
4+# this derivation sucks
5+# locale data was removed after adv_cmds-118, so our base is that because it's easier than
6+# replicating the bizarre bsdmake file structure
7+#
8+# sadly adv_cmds-118 builds a mklocale and colldef that generate files that our libc can no
9+# longer understand
10+#
11+# the more recent adv_cmds release is used for everything else in this package
12+
13+let recentAdvCmds = fetchzip {
14+ url = "http://opensource.apple.com/tarballs/adv_cmds/adv_cmds-158.tar.gz";
15+ sha256 = "0z081kcprzg5jcvqivfnwvvv6wfxzkjg2jc2lagsf8c7j7vgm8nn";
16+};
17+
18+in appleDerivation {
19+ nativeBuildInputs = [ bsdmake perl yacc flex ];
20+ buildInputs = [ flex ];
21+
22+ patchPhase = ''
23+ substituteInPlace BSDmakefile \
24+ --replace chgrp true \
25+ --replace /Developer/Makefiles/bin/compress-man-pages.pl true \
26+ --replace "ps.tproj" "" --replace "gencat.tproj" "" --replace "md.tproj" "" \
27+ --replace "tabs.tproj" "" --replace "cap_mkdb.tproj" "" \
28+ --replace "!= tconf --test TARGET_OS_EMBEDDED" "= NO"
29+
30+ substituteInPlace Makefile --replace perl true
31+
32+ for subproject in colldef mklocale monetdef msgdef numericdef timedef; do
33+ substituteInPlace usr-share-locale.tproj/$subproject/BSDmakefile \
34+ --replace /usr/share/locale "" \
35+ --replace '-o ''${BINOWN} -g ''${BINGRP}' "" \
36+ --replace "rsync -a" "cp -r"
37+ done
38+ '';
39+
40+ preBuild = ''
41+ cp -r --no-preserve=all ${recentAdvCmds}/colldef .
42+ pushd colldef
43+ mv locale/collate.h .
44+ flex -t -8 -i scan.l > scan.c
45+ yacc -d parse.y
46+ clang *.c -o colldef -lfl
47+ popd
48+ mv colldef/colldef colldef.tproj/colldef
49+
50+ cp -r --no-preserve=all ${recentAdvCmds}/mklocale .
51+ pushd mklocale
52+ flex -t -8 -i lex.l > lex.c
53+ yacc -d yacc.y
54+ clang *.c -o mklocale -lfl
55+ popd
56+ mv mklocale/mklocale mklocale.tproj/mklocale
57+ '';
58+
59+ buildPhase = ''
60+ runHook preBuild
61+
62+ bsdmake -C usr-share-locale.tproj
63+
64+ clang ${recentAdvCmds}/ps/*.c -o ps
65+ '';
66+
67+ installPhase = ''
68+ bsdmake -C usr-share-locale.tproj install DESTDIR="$locale/share/locale"
69+
70+ # need to get rid of runtime dependency on flex
71+ # install -d 0755 $locale/bin
72+ # install -m 0755 colldef.tproj/colldef $locale/bin
73+ # install -m 0755 mklocale.tproj/mklocale $locale/bin
74+
75+ install -d 0755 $ps/bin
76+ install ps $ps/bin/ps
77+ touch "$out"
78+ '';
79+
80+ outputs = [
81+ "out"
82+ "ps"
83+ "locale"
84+ ];
85+ setOutputFlags = false;
86+
87+ meta = {
88+ platforms = stdenv.lib.platforms.darwin;
89+ maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
90+ };
91+}
pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix+31−72
@@ -1,69 +1,36 @@
1−{ stdenv, appleDerivation, fetchzip, bsdmake, perl, flex, yacc
2−}:
1+{ stdenv, appleDerivation, xcbuild, ncurses, libutil }:
32
4−# this derivation sucks
5−# locale data was removed after adv_cmds-118, so our base is that because it's easier than
6−# replicating the bizarre bsdmake file structure
7−#
8−# sadly adv_cmds-118 builds a mklocale and colldef that generate files that our libc can no
9−# longer understand
10−#
11−# the more recent adv_cmds release is used for everything else in this package
3+appleDerivation {
4+ # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264
125
13−let recentAdvCmds = fetchzip {
14− url = "https://opensource.apple.com/tarballs/adv_cmds/adv_cmds-158.tar.gz";
15− sha256 = "0z081kcprzg5jcvqivfnwvvv6wfxzkjg2jc2lagsf8c7j7vgm8nn";
16−};
17−
18−in appleDerivation {
19− nativeBuildInputs = [ bsdmake perl yacc flex ];
20− buildInputs = [ flex ];
6+ # pkill requires special private headers that are unavailable in
7+ # NixPkgs. These ones are needed:
8+ # - xpc/xpxc.h
9+ # - os/base_private.h
10+ # - _simple.h
11+ # We disable it here for now. TODO: build pkill inside adv_cmds
2112
13+ # We also disable locale here because of some issues with a missing
14+ # "lstdc++".
2215 patchPhase = ''
23− substituteInPlace BSDmakefile \
24− --replace chgrp true \
25− --replace /Developer/Makefiles/bin/compress-man-pages.pl true \
26− --replace "ps.tproj" "" --replace "gencat.tproj" "" --replace "md.tproj" "" \
27− --replace "tabs.tproj" "" --replace "cap_mkdb.tproj" "" \
28− --replace "!= tconf --test TARGET_OS_EMBEDDED" "= NO"
29−
30− substituteInPlace Makefile --replace perl true
31−
32− for subproject in colldef mklocale monetdef msgdef numericdef timedef; do
33− substituteInPlace usr-share-locale.tproj/$subproject/BSDmakefile \
34− --replace /usr/share/locale "" \
35− --replace '-o ''${BINOWN} -g ''${BINGRP}' "" \
36− --replace "rsync -a" "cp -r"
37− done
38− '';
39−
40− preBuild = ''
41− cp -r --no-preserve=all ${recentAdvCmds}/colldef .
42− pushd colldef
43− mv locale/collate.h .
44− flex -t -8 -i scan.l > scan.c
45− yacc -d parse.y
46− clang *.c -o colldef -lfl
47− popd
48− mv colldef/colldef colldef.tproj/colldef
49−
50− cp -r --no-preserve=all ${recentAdvCmds}/mklocale .
51− pushd mklocale
52− flex -t -8 -i lex.l > lex.c
53− yacc -d yacc.y
54− clang *.c -o mklocale -lfl
55− popd
56− mv mklocale/mklocale mklocale.tproj/mklocale
16+ substituteInPlace adv_cmds.xcodeproj/project.pbxproj \
17+ --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" \
18+ --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" \
19+ --replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib'
5720 '';
5821
5922 buildPhase = ''
60− runHook preBuild
61−
62− bsdmake -C usr-share-locale.tproj
23+ targets=$(xcodebuild -list \
24+ | awk '/Targets:/{p=1;print;next} p&&/^\s*$/{p=0};p' \
25+ | tail -n +2 | sed 's/^[ \t]*//' \
26+ | grep -v -e Desktop -e Embedded -e mklocale -e colldef)
6327
64− clang ${recentAdvCmds}/ps/*.c -o ps
28+ for i in $targets; do
29+ xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates -target $i
30+ done
6531 '';
6632
33+ # temporary install phase until xcodebuild has "install" support
6734 installPhase = ''
6835 for f in Products/Release/*; do
6936 if [ -f $f ]; then
@@ -71,27 +38,19 @@ in appleDerivation {
7138 fi
7239 done
7340
74− bsdmake -C usr-share-locale.tproj install DESTDIR="$locale/share/locale"
75−
76− # need to get rid of runtime dependency on flex
77− # install -d 0755 $locale/bin
78− # install -m 0755 colldef.tproj/colldef $locale/bin
79− # install -m 0755 mklocale.tproj/mklocale $locale/bin
41+ mkdir -p $out/System/Library/LaunchDaemons
42+ install fingerd/finger.plist $out/System/Library/LaunchDaemons
8043
81− install -d 0755 $ps/bin
82− install ps $ps/bin/ps
83− touch "$out"
44+ # from variant_links.sh
45+ # ln -s $out/bin/pkill $out/bin/pgrep
46+ # ln -s $out/share/man/man1/pkill.1 $out/share/man/man1/pgrep.1
8447 '';
8548
86− outputs = [
87− "out"
88− "ps"
89− "locale"
90− ];
91− setOutputFlags = false;
49+ nativeBuildInputs = [ xcbuild ];
50+ buildInputs = [ ncurses libutil ];
9251
9352 meta = {
9453 platforms = stdenv.lib.platforms.darwin;
95− maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
54+ maintainers = with stdenv.lib.maintainers; [ matthewbauer ];
9655 };
9756}
pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nixdeleted−59
@@ -1,59 +0,0 @@
1−{ stdenv, appleDerivation, xcbuild, ncurses, libutil-new }:
2−
3−appleDerivation {
4− # We can't just run the root build, because https://github.com/facebook/xcbuild/issues/264
5−
6− # pkill requires special private headers that are unavailable in
7− # NixPkgs. These ones are needed:
8− # - xpc/xpxc.h
9− # - os/base_private.h
10− # - _simple.h
11− # We disable it here for now. TODO: build pkill inside adv_cmds
12−
13− # We also disable locale here because of some issues with a missing
14− # "lstdc++".
15− patchPhase = ''
16− substituteInPlace adv_cmds.xcodeproj/project.pbxproj \
17− --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" \
18− --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" \
19− --replace '/usr/lib/libtermcap.dylib' 'libncurses.dylib' \
20− --replace 'DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";' ""
21− '';
22−
23− buildPhase = ''
24− targets=$(xcodebuild -list \
25− | awk '/Targets:/{p=1;print;next} p&&/^\s*$/{p=0};p' \
26− | tail -n +2 | sed 's/^[ \t]*//' \
27− | grep -v -e Desktop -e Embedded -e mklocale -e colldef)
28−
29− for i in $targets; do
30− xcodebuild SYMROOT=$PWD/Products OBJROOT=$PWD/Intermediates -target $i
31− done
32− '';
33−
34− # temporary install phase until xcodebuild has "install" support
35− installPhase = ''
36− mkdir -p $out/bin/
37− install Products/Release/* $out/bin/
38−
39− for n in 1 8; do
40− mkdir -p $out/share/man/man$n
41− install */*.$n $out/share/man/man$n
42− done
43−
44− mkdir -p $out/System/Library/LaunchDaemons
45− install fingerd/finger.plist $out/System/Library/LaunchDaemons
46−
47− # from variant_links.sh
48− # ln -s $out/bin/pkill $out/bin/pgrep
49− # ln -s $out/share/man/man1/pkill.1 $out/share/man/man1/pgrep.1
50− '';
51−
52− nativeBuildInputs = [ xcbuild ];
53− buildInputs = [ ncurses libutil-new ];
54−
55− meta = {
56− platforms = stdenv.lib.platforms.darwin;
57− maintainers = with stdenv.lib.maintainers; [ matthewbauer ];
58− };
59−}
pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix+1
@@ -32,6 +32,7 @@ appleDerivation {
3232 chmod +x mig.sh
3333 cp mig.sh $out/bin/mig
3434 cp migcom $out/libexec
35+ ln -s $out/libexec/migcom $out/bin/migcom
3536 cp mig.1 $out/share/man/man1
3637 cp migcom.1 $out/share/man/man1
3738
pkgs/os-specific/darwin/apple-source-releases/default.nix+56−83
@@ -6,9 +6,31 @@ let
66 # a stdenv out of something like this. With some care we can probably get rid of this, but for
77 # now it's staying here.
88 versions = {
9+ "osx-10.12.6" = {
10+ xnu = "3789.70.16";
11+ libiconv = "50";
12+ Libnotify = "165.20.1";
13+ objc4 = "709.1";
14+ dyld = "433.5";
15+ CommonCrypto = "60092.50.5";
16+ copyfile = "138";
17+ ppp = "838.50.1";
18+ libclosure = "67";
19+ Libinfo = "503.50.4";
20+ Libsystem = "1238.60.2";
21+ removefile = "45";
22+ libresolv = "64";
23+ libplatform = "126.50.8";
24+ mDNSResponder = "765.50.9";
25+ libutil = "47.30.1";
26+ libunwind = "35.3";
27+ Libc = "1158.50.2";
28+ dtrace = "209.50.12";
29+ libpthread = "218.60.3";
30+ hfs = "366.70.1";
31+ };
932 "osx-10.11.6" = {
1033 PowerManagement = "572.50.1";
11− SmartCardServices = "55111";
1234 dtrace = "168";
1335 xnu = "3248.60.10";
1436 libpthread = "138.10.4";
@@ -58,7 +80,6 @@ let
5880 ICU = "531.48";
5981 libdispatch = "442.1.4";
6082 Security = "57031.40.6";
61− security_systemkeychain = "55202";
6283
6384 IOAudioFamily = "203.3";
6485 IOFireWireFamily = "458";
@@ -94,28 +115,6 @@ let
94115 "osx-10.8.4" = {
95116 IOUSBFamily = "560.4.2";
96117 };
97− "osx-10.7.5" = {
98− libsecurity_apple_csp = "55003";
99− libsecurity_apple_cspdl = "55000";
100− libsecurity_apple_file_dl = "55000";
101− libsecurity_apple_x509_cl = "55004";
102− libsecurity_apple_x509_tp = "55009.3";
103− libsecurity_asn1 = "55000.2";
104− libsecurity_cdsa_client = "55000";
105− libsecurity_cdsa_plugin = "55001";
106− libsecurity_cdsa_utilities = "55006";
107− libsecurity_cdsa_utils = "55000";
108− libsecurity_codesigning = "55037.15";
109− libsecurity_cssm = "55005.5";
110− libsecurity_filedb = "55016.1";
111− libsecurity_keychain = "55050.9";
112− libsecurity_mds = "55000";
113− libsecurity_ocspd = "55010";
114− libsecurity_pkcs12 = "55000";
115− libsecurity_sd_cspdl = "55003";
116− libsecurity_utilities = "55030.3";
117− libsecurityd = "55004";
118− };
119118 "osx-10.7.4" = {
120119 Libm = "2026";
121120 };
@@ -166,10 +165,6 @@ let
166165 callPackage = pkgs.newScope (packages // pkgs.darwin // { inherit appleDerivation name version; });
167166 in callPackage (./. + "/${namePath}");
168167
169− libsecPackage = pkgs.callPackage ./libsecurity_generic {
170− inherit applePackage appleDerivation_;
171− };
172−
173168 IOKitSpecs = {
174169 IOAudioFamily = fetchApple "osx-10.10.5" "0ggq7za3iq8g02j16rj67prqhrw828jsw3ah3bxq8a1cvr55aqnq";
175170 IOFireWireFamily = fetchApple "osx-10.10.5" "059qa1m668kwvchl90cqcx35b31zaqdg61zi11y1imn5s389y2g1";
@@ -194,60 +189,58 @@ let
194189
195190 IOKitSrcs = stdenv.lib.mapAttrs (name: value: if stdenv.lib.isFunction value then value name else value) IOKitSpecs;
196191
197− adv_cmds = applePackage "adv_cmds" "osx-10.5.8" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {};
192+ # Only used for bootstrapping. It’s convenient because it was the last version to come with a real makefile.
193+ adv_cmds-boot = applePackage "adv_cmds/boot.nix" "osx-10.5.8" "102ssayxbg9wb35mdmhswbnw0bg7js3pfd8fcbic83c5q3bqa6c6" {};
198194
199195 packages = {
200− SmartCardServices = applePackage "SmartCardServices" "osx-10.11.6" "1qqjlbi6j37mw9p3qpfnwf14xh9ff8h5786bmvzwc4kblfglabkm" {};
201−
202− inherit (adv_cmds) ps locale;
196+ inherit (adv_cmds-boot) ps locale;
203197 architecture = applePackage "architecture" "osx-10.11.6" "1pbpjcd7is69hn8y29i98ci0byik826if8gnp824ha92h90w0fq3" {};
204198 bootstrap_cmds = applePackage "bootstrap_cmds" "dev-tools-7.0" "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {};
205199 bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {};
206200 CarbonHeaders = applePackage "CarbonHeaders" "osx-10.6.2" "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {};
207− CommonCrypto = applePackage "CommonCrypto" "osx-10.11.6" "0vllfpb8f4f97wj2vpdd7w5k9ibnsbr6ff1zslpp6q323h01n25y" {};
208− configd = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {};
209− copyfile = applePackage "copyfile" "osx-10.11.6" "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {};
201+ CommonCrypto = applePackage "CommonCrypto" "osx-10.12.6" "0sgsqjcxbdm2g2zfpc50mzmk4b4ldyw7xvvkwiayhpczg1fga4ff" {};
202+ configd = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {
203+ Security = applePackage "Security/boot.nix" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {};
204+ };
205+ copyfile = applePackage "copyfile" "osx-10.12.6" "0a70bvzndkava1a946cdq42lnjhg7i7b5alpii3lap6r5fkvas0n" {};
210206 Csu = applePackage "Csu" "osx-10.11.6" "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {};
211− dtrace = applePackage "dtrace" "osx-10.11.6" "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {};
212− dtrace-xcode = applePackage "dtrace/xcode.nix" "osx-10.11.6" "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {};
213− dyld = applePackage "dyld" "osx-10.11.6" "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {};
207+ dtrace = applePackage "dtrace" "osx-10.12.6" "0hpd6348av463yqf70n3xkygwmf1i5zza8kps4zys52sviqz3a0l" {};
208+ dyld = applePackage "dyld" "osx-10.12.6" "0q4jmk78b5ajn33blh4agyq6v2a63lpb3fln78az0dy12bnp1qqk" {};
214209 eap8021x = applePackage "eap8021x" "osx-10.11.6" "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {};
215−
216− # Splicing is currently broken in Nixpkgs
217− # cctools need to be specified manually here to handle this
218210 ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {};
219−
220211 IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; };
221212 launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {};
222213 libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {};
223− Libc = applePackage "Libc" "osx-10.11.5" "1qv7r0dgz06jy9i5agbqzxgdibb0m8ylki6g5n5pary88lzrawfd" {
214+ Libc = applePackage "Libc" "osx-10.12.6" "183wcy1nlj2wkpfsx3k3lyv917mk8r2p72qw8lb89mbjsw3yw0xx" {
224215 Libc_10-9 = fetchzip {
225216 url = "http://www.opensource.apple.com/tarballs/Libc/Libc-997.90.3.tar.gz";
226217 sha256 = "1xchgxkxg5288r2b9yfrqji2gsgdap92k4wx2dbjwslixws12pq7";
227218 };
219+ Libc_old = applePackage "Libc/825_40_1.nix" "osx-10.8.5" "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {};
228220 };
229− Libc_old = applePackage "Libc/825_40_1.nix" "osx-10.8.5" "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {};
230221 libclosure = applePackage "libclosure" "osx-10.11.6" "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {};
231222 libdispatch = applePackage "libdispatch" "osx-10.10.5" "0jsfbzp87lwk9snlby0hd4zvj7j894p5q3cw0wdx9ny1mcp3kdcj" {};
232− libiconv = applePackage "libiconv" "osx-10.11.6" "11h6lfajydri4widis62q8scyz7z8l6msqyx40ly4ahsdlbl0981" {};
223+ libiconv = applePackage "libiconv" "osx-10.12.6" "1gg5h6z8sk851bhv87vyxzs54jmqz6lh57ny8j4s51j7srja0nly" {};
233224 Libinfo = applePackage "Libinfo" "osx-10.11.6" "0qjgkd4y8sjvwjzv5wwyzkb61pg8wwg95bkp721dgzv119dqhr8x" {};
234225 Libm = applePackage "Libm" "osx-10.7.4" "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {};
235− Libnotify = applePackage "Libnotify" "osx-10.11.6" "0zbcyxlcfhf91jxczhd5bq9qfgvg494gwwp3l7q5ayb2qdihzr8b" {};
236− libplatform = applePackage "libplatform" "osx-10.11.6" "1v4ik6vlklwsi0xb1g5kmhy29j9xk5m2y8xb9zbi1k4ng8x39czk" {};
237− libpthread = applePackage "libpthread" "osx-10.11.6" "1kbw738cmr9pa7pz1igmajs307clfq7gv2vm1sqdzhcnnjxbl28w" {};
238− libresolv = applePackage "libresolv" "osx-10.11.6" "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {};
239− Libsystem = applePackage "Libsystem" "osx-10.11.6" "1nfkmbqml587v2s1d1y2s2v8nmr577jvk51y6vqrfvsrhdhc2w94" {};
240− libutil = applePackage "libutil" "osx-10.11.6" "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {};
241− libutil-new = applePackage "libutil/new.nix" "osx-10.11.6" "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {};
242− libunwind = applePackage "libunwind" "osx-10.11.6" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {};
243− mDNSResponder = applePackage "mDNSResponder" "osx-10.11.6" "069incq28a78yh1bnr17h9cd5if5mwqpq8ahnkyxxx25fkaxgzcf" {};
244− objc4 = applePackage "objc4" "osx-10.11.6" "00b7vbgxni8frrqyi69b4njjihlwydzjd9zj9x4z5dbx8jabkvrj" {};
245− ppp = applePackage "ppp" "osx-10.11.6" "1dql6r1v0vbcs04958nn2i6p31yfsxyy51jca63bm5mf0gxalk3f" {};
246− removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {};
247− Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {};
248− xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {};
226+ Libnotify = applePackage "Libnotify" "osx-10.12.6" "0p5qhvalf6j1w6n8xwywhn6dvbpzv74q5wqrgs8rwfpf74wg6s9z" {};
227+ libplatform = applePackage "libplatform" "osx-10.12.6" "0rh1f5ybvwz8s0nwfar8s0fh7jbgwqcy903cv2x8m15iq1x599yn" {};
228+ libpthread = applePackage "libpthread" "osx-10.12.6" "1j6541rcgjpas1fc77ip5krjgw4bvz6jq7bq7h9q7axb0jv2ns6c" {};
229+ libresolv = applePackage "libresolv" "osx-10.12.6" "077j6ljfh7amqpk2146rr7dsz5vasvr3als830mgv5jzl7l6vz88" {};
230+ Libsystem = applePackage "Libsystem" "osx-10.12.6" "1082ircc1ggaq3wha218vmfa75jqdaqidsy1bmrc4ckfkbr3bwx2" {
231+ libutil = pkgs.darwin.libutil.override { headersOnly = true; };
232+ hfs = pkgs.darwin.hfs.override { headersOnly = true; };
233+ };
234+ libutil = applePackage "libutil" "osx-10.12.6" "0lqdxaj82h8yjbjm856jjz9k2d96k0viimi881akfng08xk1246y" {};
235+ libunwind = applePackage "libunwind" "osx-10.12.6" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {};
236+ mDNSResponder = applePackage "mDNSResponder" "osx-10.12.6" "02ms1p8zlgmprzn65jzr7yaqxykh3zxjcrw0c06aayim6h0dsqfy" {};
237+ objc4 = applePackage "objc4" "osx-10.12.6" "1cj1vhbcs9pkmag2ms8wslagicnq9bxi2qjkszmp3ys7z7ccrbwz" {};
238+ ppp = applePackage "ppp" "osx-10.12.6" "1kcc2nc4x1kf8sz0a23i6nfpvxg381kipi0qdisrp8x9z2gbkxb8" {};
239+ removefile = applePackage "removefile" "osx-10.12.6" "0jzjxbmxgjzhssqd50z7kq9dlwrv5fsdshh57c0f8mdwcs19bsyx" {};
240+ xnu = applePackage "xnu" "osx-10.12.6" "1sjb0i7qzz840v2h4z3s4jyjisad4r5yyi6sg8pakv3wd81i5fg5" {};
241+ hfs = applePackage "hfs" "osx-10.12.6" "1mj3xvqpq1mgd80b6kl1s04knqnap7hccr0gz8rjphalq14rbl5g" {};
249242 Librpcsvc = applePackage "Librpcsvc" "osx-10.11.6" "1zwfwcl9irxl1dlnf2b4v30vdybp0p0r6n6g1pd14zbdci1jcg2k" {};
250− adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {};
243+ adv_cmds = applePackage "adv_cmds" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {};
251244 basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {};
252245 developer_cmds = applePackage "developer_cmds" "osx-10.11.6" "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {};
253246 diskdev_cmds = applePackage "diskdev_cmds" "osx-10.11.6" "1ssdyiaq5m1zfy96yy38yyknp682ki6bvabdqd5z18fa0rv3m2ar" {};
@@ -259,28 +252,8 @@ let
259252 top = applePackage "top" "osx-10.11.6" "0i9120rfwapgwdvjbfg0ya143i29s1m8zbddsxh39pdc59xnsg5l" {};
260253 PowerManagement = applePackage "PowerManagement" "osx-10.11.6" "1llimhvp0gjffd47322lnjq7cqwinx0c5z7ikli04ad5srpa68mh" {};
261254
262− security_systemkeychain = applePackage "security_systemkeychain" "osx-10.10.5" "0xviskdgxsail15npi0billyiysvljlmg38mmhnr7qi4ymnnjr90" {};
263−
264− libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {};
265− libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {};
266− libsecurity_apple_file_dl = libsecPackage "libsecurity_apple_file_dl" "osx-10.7.5" "1dfqani3n135i3iqmafc1k9awmz6s0a78zifhk15rx5a8ps870bl" {};
267− libsecurity_apple_x509_cl = libsecPackage "libsecurity_apple_x509_cl" "osx-10.7.5" "1gji2i080560s08k1nigsla1zdmi6slyv97xaj5vqxjpxb0g1xf5" {};
268− libsecurity_apple_x509_tp = libsecPackage "libsecurity_apple_x509_tp" "osx-10.7.5" "1bsms3nvi62wbvjviwjhjhzhylad8g6vmvlj3ngd0wyd0ywxrs46" {};
269− libsecurity_asn1 = libsecPackage "libsecurity_asn1" "osx-10.7.5" "0i8aakjxdfj0lqcgqmbip32g7r4h57xhs8w0sxfvfl45q22s782w" {};
270− libsecurity_cdsa_client = libsecPackage "libsecurity_cdsa_client" "osx-10.7.5" "127jxnypkycy8zqwicfv333h11318m00gd37jnswbrpg44xd1wdy" {};
271− libsecurity_cdsa_plugin = libsecPackage "libsecurity_cdsa_plugin" "osx-10.7.5" "0ifmx85rs51i7zjm015s8kc2dqyrlvbr39lw9xzxgd2ds33i4lfj" {};
272− libsecurity_cdsa_utilities = libsecPackage "libsecurity_cdsa_utilities" "osx-10.7.5" "1kzsl0prvfa8a0m3j3pcxq06aix1csgayd3lzx27iqg84c8mhzan" {};
273− libsecurity_cdsa_utils = libsecPackage "libsecurity_cdsa_utils" "osx-10.7.5" "0q55jizav6n0lkj7lcmcr2mjdhnbnnn525fa9ipwgvzbspihw0g6" {};
274− libsecurity_codesigning = libsecPackage "libsecurity_codesigning" "osx-10.7.5" "0vf5nj2g383b4hknlp51qll5pm8z4qbf56dnc16n3wm8gj82iasy" {};
275− libsecurity_cssm = libsecPackage "libsecurity_cssm" "osx-10.7.5" "0l6ia533bhr8kqp2wa712bnzzzisif3kbn7h3bzzf4nps4wmwzn4" {};
276− libsecurity_filedb = libsecPackage "libsecurity_filedb" "osx-10.7.5" "1r0ik95xapdl6l2lhd079vpq41jjgshz2hqb8490gpy5wyc49cxb" {};
277− libsecurity_keychain = libsecPackage "libsecurity_keychain" "osx-10.7.5" "15wf2slcgyns61kk7jndgm9h22vidyphh9x15x8viyprra9bkhja" {};
278− libsecurity_mds = libsecPackage "libsecurity_mds" "osx-10.7.5" "0vin5hnzvkx2rdzaaj2gxmx38amxlyh6j24a8gc22y09d74p5lzs" {};
279− libsecurity_ocspd = libsecPackage "libsecurity_ocspd" "osx-10.7.5" "1bxzpihc6w0ji4x8810a4lfkq83787yhjl60xm24bv1prhqcm73b" {};
280− libsecurity_pkcs12 = libsecPackage "libsecurity_pkcs12" "osx-10.7.5" "1yq8p2sp39q40fxshb256b7jn9lvmpymgpm8yz9kqrf980xddgsg" {};
281− libsecurity_sd_cspdl = libsecPackage "libsecurity_sd_cspdl" "osx-10.7.5" "10v76xycfnvz1n0zqfbwn3yh4w880lbssqhkn23iim3ihxgm5pbd" {};
282− libsecurity_utilities = libsecPackage "libsecurity_utilities" "osx-10.7.5" "0ayycfy9jm0n0c7ih9f3m69ynh8hs80v8yicq47aa1h9wclbxg8r" {};
283− libsecurityd = libsecPackage "libsecurityd" "osx-10.7.5" "1ywm2qj8l7rhaxy5biwxsyavd0d09d4bzchm03nlvwl313p2747x" {};
284− security_dotmac_tp = libsecPackage "security_dotmac_tp" "osx-10.9.5" "1l4fi9qhrghj0pkvywi8da22bh06c5bv3l40a621b5g258na50pl" {};
255+ # TODO(matthewbauer):
256+ # To be removed, once I figure out how to build a newer Security version.
257+ Security = applePackage "Security/boot.nix" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {};
285258 };
286259in packages
pkgs/os-specific/darwin/apple-source-releases/diskdev_cmds/default.nix+2−2
@@ -1,9 +1,9 @@
11{ stdenv, appleDerivation, xcbuildHook
2−, Libc, xnu, libutil-new }:
2+, Libc, xnu, libutil }:
33
44appleDerivation {
55 nativeBuildInputs = [ xcbuildHook ];
6− buildInputs = [ libutil-new ];
6+ buildInputs = [ libutil ];
77
88 NIX_CFLAGS_COMPILE = "-I.";
99 NIX_LDFLAGS = "-lutil";
pkgs/os-specific/darwin/apple-source-releases/dtrace/default.nix+41−38
@@ -1,50 +1,53 @@
1−{ appleDerivation, cctools, zlib }:
1+{ appleDerivation, xcbuildHook, CoreSymbolication
2+, xnu, bison, flex, darling, stdenv, fixDarwinDylibNames }:
23
34appleDerivation {
4− buildInputs = [ cctools zlib ];
5−
6− buildPhase = ''
7− export CFLAGS=" -I$PWD/head -I$PWD/sys -I$PWD/libelf -I$PWD/libdwarf"
8−
9− pushd libelf
10− for f in *.c; do
11− if [ "$f" != "lintsup.c" ]; then # Apple doesn't use it, so I don't either
12− cc -D_INT64_TYPE -D_LONGLONG_TYPE -D_ILP32 $CFLAGS -c $f
13− fi
14− done
15− libtool -static -o libelf.a *.o
16− popd
5+ nativeBuildInputs = [ xcbuildHook flex bison fixDarwinDylibNames ];
6+ buildInputs = [ CoreSymbolication darling xnu ];
7+ NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers -Wno-error=implicit-function-declaration";
8+ NIX_LDFLAGS = "-L./Products/Release";
9+ xcbuildFlags = "-target dtrace_frameworks -target dtrace";
10+
11+ doCheck = false;
12+ checkPhase = "xcodebuild -target dtrace_tests";
13+
14+ postPatch = ''
15+ substituteInPlace dtrace.xcodeproj/project.pbxproj \
16+ --replace "/usr/sbin" ""
17+ substituteInPlace libdtrace/dt_open.c \
18+ --replace /usr/bin/clang ${stdenv.cc.cc}/bin/clang \
19+ --replace /usr/bin/ld ${stdenv.cc.bintools.bintools}/bin/ld \
20+ --replace /usr/lib/dtrace/dt_cpp.h $out/include/dt_cpp.h \
21+ --replace /usr/lib/dtrace $out/lib/dtrace
22+ '';
1723
18− pushd libdwarf
19− ./configure CFLAGS="$CFLAGS -Icmplrs"
20− make
24+ # hack to handle xcbuild's broken lex handling
25+ preBuild = ''
26+ pushd libdtrace
27+ yacc -d dt_grammar.y
28+ flex -l -d dt_lex.l
2129 popd
2230
23− cp libelf/libelf.a tools/ctfconvert
24− cp libdwarf/libdwarf.a tools/ctfconvert
31+ substituteInPlace dtrace.xcodeproj/project.pbxproj \
32+ --replace '6EBC9800099BFBBF0001019C /* dt_grammar.y */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.yacc; name = dt_grammar.y; path = libdtrace/dt_grammar.y; sourceTree = "<group>"; };' '6EBC9800099BFBBF0001019C /* y.tab.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = y.tab.c; path = libdtrace/y.tab.c; sourceTree = "<group>"; };' \
33+ --replace '6EBC9808099BFBBF0001019C /* dt_lex.l */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.lex; name = dt_lex.l; path = libdtrace/dt_lex.l; sourceTree = "<group>"; };' '6EBC9808099BFBBF0001019C /* lex.yy.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = lex.yy.c; path = libdtrace/lex.yy.c; sourceTree = "<group>"; };'
34+ '';
35+
36+ # xcbuild doesn't support install
37+ installPhase = ''
38+ mkdir -p $out
2539
26− pushd tools/ctfconvert
27− for f in ../../darwin_shim.c *.c; do
28− cc -DNDEBUG -DNS_BLOCK_ASSERTIONS $CFLAGS -c $f
29− done
40+ cp -r Products/Release/usr/include $out/include
41+ cp scripts/dt_cpp.h $out/include/dt_cpp.h
3042
31− export COMMON="alist.o ctf.o darwin_shim.o hash.o iidesc.o input.o list.o \
32− memory.o output.o stack.o strtab.o symbol.o tdata.o traverse.o util.o"
43+ mkdir $out/lib
44+ cp Products/Release/*.dylib $out/lib
3345
34− export CONVERT="ctfconvert.o dwarf.o merge.o st_bugs.o st_parse.o stabs.o"
35− export MERGE="barrier.o ctfmerge.o dwarf.o fifo.o merge.o st_bugs.o st_parse.o stabs.o utils.o"
36− export DUMP="dump.o fifo.o utils.o"
46+ mkdir $out/bin
47+ cp Products/Release/dtrace $out/bin
3748
38− clang -o ctfconvert $CONVERT $COMMON -L. -lz -lelf -ldwarf
39− clang -o ctfmerge $MERGE $COMMON -L. -lz -lelf -ldwarf
40− clang -o ctfdump $DUMP $COMMON -L. -lz -lelf
41− popd
42− '';
49+ mkdir -p $out/lib/dtrace
4350
44− installPhase = ''
45− mkdir -p $out/bin
46− cp tools/ctfconvert/ctfconvert $out/bin
47− cp tools/ctfconvert/ctfmerge $out/bin
48− cp tools/ctfconvert/ctfdump $out/bin
51+ install_name_tool -change $PWD/Products/Release/libdtrace.dylib $out/lib/libdtrace.dylib $out/bin/dtrace
4952 '';
5053}
pkgs/os-specific/darwin/apple-source-releases/dtrace/xcode.nixdeleted−47
@@ -1,47 +0,0 @@
1−{ appleDerivation, xcbuildHook, CoreSymbolication
2−, xnu, bison, flex, darling, stdenv }:
3−
4−appleDerivation {
5− nativeBuildInputs = [ xcbuildHook flex bison ];
6− buildInputs = [ CoreSymbolication darling ];
7− NIX_CFLAGS_COMPILE = "-DCTF_OLD_VERSIONS -DPRIVATE -DYYDEBUG=1 -I${xnu}/Library/Frameworks/System.framework/Headers";
8− NIX_LDFLAGS = "-L./Products/Release";
9− xcbuildFlags = "-target dtrace";
10−
11− patchPhase = ''
12− substituteInPlace dtrace.xcodeproj/project.pbxproj --replace "/usr/sbin" ""
13− substituteInPlace libdtrace/dt_open.c \
14− --replace "/usr/bin/clang" "${stdenv.cc}/bin/cpp" \
15− --replace "/usr/bin/ld" "${stdenv.cc}/bin/ld" \
16− --replace "/usr/bin/dtrace" $out/lib/dtrace
17− '';
18−
19− # hack to handle xcbuild's broken lex handling
20− preBuild = ''
21− cd libdtrace
22− yacc -d dt_grammar.y
23− flex -l -d dt_lex.l
24− cd ..
25−
26− substituteInPlace dtrace.xcodeproj/project.pbxproj \
27− --replace '6EBC9800099BFBBF0001019C /* dt_grammar.y */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.yacc; name = dt_grammar.y; path = libdtrace/dt_grammar.y; sourceTree = "<group>"; };' '6EBC9800099BFBBF0001019C /* y.tab.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = y.tab.c; path = libdtrace/y.tab.c; sourceTree = "<group>"; };' \
28− --replace '6EBC9808099BFBBF0001019C /* dt_lex.l */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.lex; name = dt_lex.l; path = libdtrace/dt_lex.l; sourceTree = "<group>"; };' '6EBC9808099BFBBF0001019C /* lex.yy.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = lex.yy.c; path = libdtrace/lex.yy.c; sourceTree = "<group>"; };'
29− '';
30−
31− # xcbuild doesn't support install
32− installPhase = ''
33− mkdir -p $out
34−
35− cp -r Products/Release/usr $out
36− mv $out/usr/* $out
37− rmdir $out/usr
38−
39− mkdir $out/lib
40− cp Products/Release/*.dylib $out/lib
41−
42− mkdir $out/bin
43− cp Products/Release/dtrace $out/bin
44−
45− mkdir -p $out/lib/dtrace
46− '';
47−}
pkgs/os-specific/darwin/apple-source-releases/file_cmds/default.nix+2−2
@@ -1,8 +1,8 @@
1−{ stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil-new }:
1+{ stdenv, appleDerivation, xcbuildHook, zlib, bzip2, lzma, ncurses, libutil }:
22
33appleDerivation rec {
44 nativeBuildInputs = [ xcbuildHook ];
5− buildInputs = [ zlib bzip2 lzma ncurses libutil-new ];
5+ buildInputs = [ zlib bzip2 lzma ncurses libutil ];
66
77 # some commands not working:
88 # mtree: _simple.h not found
pkgs/os-specific/darwin/apple-source-releases/hfs/default.nixnew file+8
@@ -0,0 +1,8 @@
1+{ appleDerivation, lib, headersOnly ? false }:
2+
3+appleDerivation {
4+ installPhase = lib.optionalString headersOnly ''
5+ mkdir -p $out/include/hfs
6+ cp core/*.h $out/include/hfs
7+ '';
8+}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/GNUmakefiledeleted−11
@@ -1,11 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_apple_csp
4−
5−security_apple_csp_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_apple_csp_HEADER_FILES_DIR = lib
7−
8−security_apple_csp_CC_FILES = $(wildcard lib/*.cpp)
9−security_apple_csp_C_FILES = $(wildcard lib/*.c)
10−
11−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_csp/default.nixdeleted−31
@@ -1,31 +0,0 @@
1−{ appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_utilities, CommonCrypto, stdenv }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_cdsa_utilities
5− libsecurity_utilities
6− libsecurity_cdsa_plugin
7− libsecurity_asn1
8− libsecurity_cdsa_utils
9− ];
10− NIX_CFLAGS_COMPILE = "-Iopen_ssl";
11− patchPhase = ''
12− for file in lib/BlockCryptor.h lib/RSA_DSA_signature.h lib/castContext.h \
13− lib/RawSigner.h lib/MD2Object.h lib/HMACSHA1.h lib/bfContext.h lib/rc4Context.h; do
14− substituteInPlace ''$file --replace \
15− '"CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h"' \
16− '"${stdenv.lib.getDev apple_sdk.sdk}/include/MacTypes.h"'
17− done
18−
19− for file in lib/castContext.h lib/gladmanContext.h lib/desContext.h lib/rc4Context.h; do
20− substituteInPlace ''$file --replace \
21− '/usr/local/include/CommonCrypto/CommonCryptorSPI.h' \
22− '${CommonCrypto}/include/CommonCrypto/CommonCryptorSPI.h'
23− done
24−
25− substituteInPlace lib/opensshWrap.cpp --replace RSA_DSA_Keys.h RSA_DSA_keys.h
26− '' + stdenv.lib.optionalString (!stdenv.cc.nativeLibc) ''
27− substituteInPlace lib/pbkdf2.c --replace \
28− '<CoreServices/../Frameworks/CarbonCore.framework/Headers/ConditionalMacros.h>' \
29− '"${stdenv.libc}/include/ConditionalMacros.h"'
30− '';
31−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_cspdl/GNUmakefiledeleted−10
@@ -1,10 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_apple_cspdl
4−
5−security_apple_cspdl_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_apple_cspdl_HEADER_FILES_DIR = lib
7−
8−security_apple_cspdl_CC_FILES = $(wildcard lib/*.cpp)
9−
10−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_cspdl/default.nixdeleted−16
@@ -1,16 +0,0 @@
1−{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_keychain, libsecurity_utilities, libsecurityd }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_cdsa_plugin
5− libsecurity_cdsa_utilities
6− libsecurity_utilities
7− libsecurityd
8− libsecurity_cdsa_client
9− libsecurity_keychain
10− ];
11− patchPhase = ''
12− for file in lib/*; do
13− sed -i 's/#include <\(.*\)>/#include "\1"/' ''$file
14− done
15− '';
16−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_file_dl/GNUmakefiledeleted−10
@@ -1,10 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_apple_file_dl
4−
5−security_apple_file_dl_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_apple_file_dl_HEADER_FILES_DIR = lib
7−
8−security_apple_file_dl_CC_FILES = $(wildcard lib/*.cpp)
9−
10−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_file_dl/default.nixdeleted−17
@@ -1,17 +0,0 @@
1−{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_keychain, libsecurity_utilities, libsecurityd }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_cdsa_plugin
5− libsecurity_cdsa_utilities
6− libsecurity_utilities
7− libsecurityd
8− libsecurity_cdsa_client
9− libsecurity_keychain
10− libsecurity_filedb
11− ];
12− patchPhase = ''
13− for file in lib/*; do
14− sed -i 's/#include <\(.*\)>/#include "\1"/' ''$file
15− done
16− '';
17−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/GNUmakefiledeleted−10
@@ -1,10 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_apple_x509_cl
4−
5−security_apple_x509_cl_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_apple_x509_cl_HEADER_FILES_DIR = lib
7−
8−security_apple_x509_cl_CC_FILES = $(wildcard lib/*.cpp)
9−
10−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_cl/default.nixdeleted−18
@@ -1,18 +0,0 @@
1−{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_keychain, libsecurity_utilities, libsecurityd }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_cdsa_plugin
5− libsecurity_cdsa_utilities
6− libsecurity_utilities
7− libsecurityd
8− libsecurity_cdsa_client
9− libsecurity_keychain
10− libsecurity_filedb
11− libsecurity_asn1
12− ];
13− patchPhase = ''
14− for file in lib/*; do
15− sed -i 's/#include <\(.*\)>/#include "\1"/' ''$file
16− done
17− '';
18−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/GNUmakefiledeleted−11
@@ -1,11 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_apple_x509_tp
4−
5−security_apple_x509_tp_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_apple_x509_tp_HEADER_FILES_DIR = lib
7−
8−security_apple_x509_tp_C_FILES = $(wildcard lib/*.c)
9−security_apple_x509_tp_CC_FILES = $(wildcard lib/*.cpp)
10−
11−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_apple_x509_tp/default.nixdeleted−19
@@ -1,19 +0,0 @@
1−{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_keychain, libsecurity_ocspd, libsecurity_utilities, libsecurityd }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_cdsa_plugin
5− libsecurity_cdsa_utilities
6− libsecurity_utilities
7− libsecurityd
8− libsecurity_cdsa_client
9− libsecurity_keychain
10− libsecurity_filedb
11− libsecurity_asn1
12− libsecurity_ocspd
13− ];
14− patchPhase = ''
15− for file in lib/*; do
16− sed -i 's/#include <\(.*\)>/#include "\1"/' ''$file
17− done
18− '';
19−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/GNUmakefiledeleted−11
@@ -1,11 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_asn1
4−
5−security_asn1_C_FILES = $(wildcard lib/*.c)
6−security_asn1_CC_FILES = $(wildcard lib/*.cpp)
7−
8−security_asn1_HEADER_FILES = $(notdir $(wildcard lib/*.h))
9−security_asn1_HEADER_FILES_DIR = lib
10−
11−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_asn1/default.nixdeleted−14
@@ -1,14 +0,0 @@
1−{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities }:
2−appleDerivation {
3− __propagatedImpureHostDeps = [
4− "/System/Library/Frameworks/Security.framework/Security"
5− "/System/Library/Frameworks/Security.framework/Resources"
6− "/System/Library/Frameworks/Security.framework/PlugIns"
7− "/System/Library/Frameworks/Security.framework/XPCServices"
8− "/System/Library/Frameworks/Security.framework/Versions"
9− ];
10− propagatedBuildInputs = [
11− libsecurity_utilities
12− libsecurity_cdsa_utilities
13− ];
14−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_client/GNUmakefiledeleted−10
@@ -1,10 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_cdsa_client
4−
5−security_cdsa_client_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_cdsa_client_HEADER_FILES_DIR = lib
7−
8−security_cdsa_client_CC_FILES = $(wildcard lib/*.cpp)
9−
10−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_client/default.nixdeleted−8
@@ -1,8 +0,0 @@
1−{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, libsecurityd }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_utilities
5− libsecurity_cdsa_utilities
6− libsecurityd
7− ];
8−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/GNUmakefiledeleted−10
@@ -1,10 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_cdsa_plugin
4−
5−security_cdsa_plugin_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_cdsa_plugin_HEADER_FILES_DIR = lib
7−
8−security_cdsa_plugin_CC_FILES = $(wildcard lib/*.cpp)
9−
10−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_plugin/default.nixdeleted−15
@@ -1,15 +0,0 @@
1−{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_cssm, libsecurity_utilities, perl }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_cdsa_utilities
5− libsecurity_utilities
6− perl
7− ];
8− patchPhase = ''
9− unpackFile ${libsecurity_cssm.src}
10− cp libsecurity_cssm*/lib/cssm{dli,aci,cli,cspi,tpi}.h lib
11− '';
12− preBuild = ''
13− perl lib/generator.pl lib lib/generator.cfg lib lib || exit 1
14− '';
15−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/GNUmakefiledeleted−13
@@ -1,13 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_cdsa_utilities
4−
5−security_cdsa_utilities_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_cdsa_utilities_HEADER_FILES_DIR = lib
7−
8−security_cdsa_utilities_CC_FILES = $(wildcard lib/*.cpp) lib/Schema.cpp lib/KeySchema.cpp
9−
10−lib/%.cpp: lib/%.m4
11− m4 $< > $@
12−
13−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/default.nixdeleted−13
@@ -1,13 +0,0 @@
1−{ CommonCrypto, appleDerivation, libsecurity_codesigning, libsecurity_utilities, m4 }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_utilities
5− m4
6− ];
7− patchPhase = ''
8− patch -p1 < ${./handletemplates.patch}
9− unpackFile ${libsecurity_codesigning.src}
10− mv libsecurity_codesigning*/lib security_codesigning
11− '';
12− NIX_CFLAGS_COMPILE = "-I${CommonCrypto}/include/CommonCrypto";
13−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utilities/handletemplates.patchdeleted−19
@@ -1,19 +0,0 @@
1−--- a/lib/handletemplates.h 1969-12-31 16:00:01.000000000 -0800
2−+++ b/lib/handletemplates.h 1969-12-31 16:00:01.000000000 -0800
3−@@ -32,6 +32,7 @@
4− #include <security_utilities/threading.h>
5− #include <security_utilities/globalizer.h>
6− #include <security_cdsa_utilities/cssmerrors.h>
7−+#include <vector>
8−
9− #if __GNUC__ > 2
10− #include <ext/hash_map>
11−@@ -129,7 +130,7 @@
12− // @@@ Remove when 4003540 is fixed
13− template <class Subtype>
14− static void findAllRefs(std::vector<_Handle> &refs) {
15−- state().findAllRefs<Subtype>(refs);
16−+ state().template findAllRefs<Subtype>(refs);
17− }
18−
19− protected:
pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/GNUmakefiledeleted−13
@@ -1,13 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_cdsa_utils
4−
5−security_cdsa_utils_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_cdsa_utils_HEADER_FILES_DIR = lib
7−
8−security_cdsa_utils_CC_FILES = $(wildcard lib/*.cpp)
9−
10−lib/%.cpp: lib/%.m4
11− m4 $< > $@
12−
13−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_cdsa_utils/default.nixdeleted−8
@@ -1,8 +0,0 @@
1−{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities, m4 }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_utilities
5− libsecurity_cdsa_utilities
6− m4
7− ];
8−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/GNUmakefiledeleted−10
@@ -1,10 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_codesigning
4−
5−security_codesigning_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_codesigning_HEADER_FILES_DIR = lib
7−
8−security_codesigning_CC_FILES = $(wildcard lib/*.cpp)
9−
10−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_codesigning/default.nixdeleted−33
@@ -1,33 +0,0 @@
1−{ appleDerivation, libsecurity_cdsa_utilities, libsecurity_utilities
2−, Security, xnu, xar, antlr, libsecurityd, apple_sdk
3−, dtrace-xcode, osx_private_sdk }:
4−appleDerivation {
5− buildInputs = [ libsecurity_utilities libsecurity_cdsa_utilities dtrace-xcode
6− Security xar antlr libsecurityd ];
7− NIX_CFLAGS_COMPILE = "-Iinclude -I${xnu}/Library/Frameworks/System.framework/Headers";
8− patchPhase = ''
9− substituteInPlace lib/policydb.cpp \
10− --replace "new MutableDictionary::MutableDictionary()" NULL
11− substituteInPlace lib/xpcengine.h \
12− --replace "#include <xpc/private.h>" ""
13− substituteInPlace lib/policyengine.cpp \
14− --replace "#include <OpenScriptingUtilPriv.h>" ""
15−
16− rm lib/policyengine.cpp lib/quarantine++.cpp lib/codedirectory.cpp lib/xpcengine.cpp
17− '';
18− preBuild = ''
19− mkdir -p include
20− cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/usr/include/quarantine.h include
21− mkdir -p include/CoreServices/
22− cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/System/Library/Frameworks/CoreServices.framework/PrivateHeaders/*.h include/CoreServices/
23−
24− unpackFile ${Security.src}
25− mkdir -p include/securityd_client
26− cp Security-*/libsecurityd/lib/*.h include/securityd_client
27− mkdir -p include/xpc
28− cp ${apple_sdk.sdk.out}/include/xpc/*.h include/xpc
29−
30− sed -i '1i #define bool int' lib/security_codesigning.d
31− dtrace -h -C -s lib/security_codesigning.d -o codesigning_dtrace.h
32− '';
33−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/GNUmakefiledeleted−11
@@ -1,11 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_cssm
4−
5−security_cssm_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_cssm_HEADER_FILES_DIR = lib
7−
8−security_cssm_CC_FILES = $(wildcard lib/*.cpp)
9−security_cssm_C_FILES = $(wildcard lib/*.c)
10−
11−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_cssm/default.nixdeleted−14
@@ -1,14 +0,0 @@
1−{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_utilities, perl }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_utilities
5− libsecurity_cdsa_utilities
6− libsecurity_cdsa_client
7− perl
8− libsecurity_cdsa_plugin
9− ];
10− preBuild = ''
11− mkdir derived_src
12− perl lib/generator.pl lib lib/generator.cfg derived_src
13− '';
14−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/GNUmakefiledeleted−10
@@ -1,10 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_filedb
4−
5−security_filedb_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_filedb_HEADER_FILES_DIR = lib
7−
8−security_filedb_CC_FILES = $(wildcard lib/*.cpp)
9−
10−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_filedb/default.nixdeleted−13
@@ -1,13 +0,0 @@
1−{ appleDerivation, apple_sdk, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_utilities, osx_private_sdk, lib }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_utilities
5− libsecurity_cdsa_utilities
6− libsecurity_cdsa_plugin
7− ];
8− patchPhase = ''
9− cp ${osx_private_sdk}/include/sandbox_private.h .
10− substituteInPlace sandbox_private.h --replace '<sandbox.h>' '"${lib.getDev apple_sdk.sdk}/include/sandbox.h"'
11− substituteInPlace lib/AtomicFile.cpp --replace '<sandbox.h>' '"sandbox_private.h"'
12− '';
13−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/default.nixdeleted−63
@@ -1,63 +0,0 @@
1−{ appleDerivation_, applePackage, pkgs, stdenv }:
2−name: version: sha256: args: let
3− n = stdenv.lib.removePrefix "lib" name;
4− makeFile = ../. + "/${name}/GNUmakefile";
5− appleDerivation = appleDerivation_ name version sha256;
6− in applePackage name version sha256 (args // {
7− appleDerivation = a:
8− appleDerivation (stdenv.lib.mergeAttrsConcatenateValues {
9− __impureHostDeps = import ./impure_deps.nix;
10−
11− patchPhase = ''
12− # allows including <Security/some-private-header.h>
13− cp -R ${pkgs.darwin.osx_private_sdk}/include/SecurityPrivateHeaders Security
14−
15− grep -Rl MacErrors.h . | while read file; do
16− substituteInPlace "''$file" --replace \
17− '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \
18− '"${pkgs.darwin.apple_sdk.sdk.out}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
19− done || true # grep returns 1 if it can't find the string
20−
21− grep -Rl MacTypes.h . | while read file; do
22− substituteInPlace "''$file" --replace \
23− '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>' \
24− '"${stdenv.lib.getDev pkgs.darwin.apple_sdk.sdk}/include/MacTypes.h"'
25− done || true # grep returns 1 if it can't find the string
26− '';
27− preBuild = ''
28− ln -s lib ${n}
29− makeFlagsArray=(-j$NIX_BUILD_CORES)
30− '';
31− outputs = [ "out" "dev" ];
32− buildInputs = [
33− pkgs.gnustep.make
34− pkgs.darwin.apple_sdk.frameworks.AppKit
35− pkgs.darwin.apple_sdk.frameworks.Foundation
36− ];
37− makeFlags = [
38− "-f${makeFile}"
39− "MAKEFILE_NAME=${makeFile}"
40− "GNUSTEP_ABSOLUTE_INSTALL_PATHS=yes"
41− "GNUSTEP_MAKEFILES=${pkgs.gnustep.make}/share/GNUstep/Makefiles"
42− "LIB_LINK_INSTALL_DIR=\$(out)/lib"
43− ];
44− installFlags = [
45− "${n}_INSTALL_DIR=\$(out)/lib"
46− "${n}_HEADER_FILES_INSTALL_DIR=\$(out)/include/${n}"
47− "GNUSTEP_HEADERS="
48− ];
49− NIX_CFLAGS_COMPILE = [
50− "-isystem lib"
51− "-iframework ${pkgs.darwin.Security}/Library/Frameworks"
52− "-I."
53− "-Wno-deprecated-declarations"
54− "-DNDEBUG"
55− ];
56− NIX_LDFLAGS = with pkgs.darwin; with apple_sdk.frameworks; [
57− "-L${libobjc}/lib"
58− "-F${Foundation}/Library/Frameworks"
59− "-F${AppKit}/Library/Frameworks"
60− "-no_dtrace_dof"
61− ];
62− } a);
63− })
pkgs/os-specific/darwin/apple-source-releases/libsecurity_generic/impure_deps.nixdeleted−128
@@ -1,128 +0,0 @@
1−# generated using a ruby script
2−[
3− "/System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate"
4− "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage"
5− "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib"
6− "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib"
7− "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLinearAlgebra.dylib"
8− "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib"
9− "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib"
10− "/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib"
11− "/System/Library/Frameworks/AppKit.framework/Versions/C/AppKit"
12− "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices"
13− "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS"
14− "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontParser.dylib"
15− "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontRegistry.dylib"
16− "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSync.framework/Versions/A/ColorSync"
17− "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices"
18− "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis"
19− "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore"
20− "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD"
21− "/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis"
22− "/System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox"
23− "/System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit"
24− "/System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork"
25− "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CarbonSound.framework/Versions/A/CarbonSound"
26− "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox"
27− "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Ink.framework/Versions/A/Ink"
28− "/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition"
29− "/System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio"
30− "/System/Library/Frameworks/CoreBluetooth.framework/Versions/A/CoreBluetooth"
31− "/System/Library/Frameworks/CoreData.framework/Versions/A/CoreData"
32− "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation"
33− "/System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics"
34− "/System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices"
35− "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE"
36− "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore"
37− "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices"
38− "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents"
39− "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices"
40− "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata"
41− "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices"
42− "/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit"
43− "/System/Library/Frameworks/CoreText.framework/Versions/A/CoreText"
44− "/System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo"
45− "/System/Library/Frameworks/CoreWLAN.framework/Versions/A/CoreWLAN"
46− "/System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration"
47− "/System/Library/Frameworks/Foundation.framework/Versions/C/Foundation"
48− "/System/Library/Frameworks/GSS.framework/Versions/A/GSS"
49− "/System/Library/Frameworks/IOBluetooth.framework/Versions/A/IOBluetooth"
50− "/System/Library/Frameworks/IOKit.framework/Versions/A/IOKit"
51− "/System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface"
52− "/System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO"
53− "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib"
54− "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib"
55− "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib"
56− "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib"
57− "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib"
58− "/System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib"
59− "/System/Library/Frameworks/Kerberos.framework/Versions/A/Kerberos"
60− "/System/Library/Frameworks/NetFS.framework/Versions/A/NetFS"
61− "/System/Library/Frameworks/OpenCL.framework/Versions/A/OpenCL"
62− "/System/Library/Frameworks/OpenDirectory.framework/Versions/A/Frameworks/CFOpenDirectory.framework/Versions/A/CFOpenDirectory"
63− "/System/Library/Frameworks/OpenDirectory.framework/Versions/A/OpenDirectory"
64− "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCVMSPluginSupport.dylib"
65− "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreVMClient.dylib"
66− "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGFXShared.dylib"
67− "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
68− "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib"
69− "/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib"
70− "/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL"
71− "/System/Library/Frameworks/QuartzCore.framework/Versions/A/Frameworks/CoreImage.framework/Versions/A/CoreImage"
72− "/System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore"
73− "/System/Library/Frameworks/Security.framework/Versions/A/Security"
74− "/System/Library/Frameworks/SecurityFoundation.framework/Versions/A/SecurityFoundation"
75− "/System/Library/Frameworks/ServiceManagement.framework/Versions/A/ServiceManagement"
76− "/System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration"
77− "/System/Library/PrivateFrameworks/Apple80211.framework/Versions/A/Apple80211"
78− "/System/Library/PrivateFrameworks/AppleJPEG.framework/Versions/A/AppleJPEG"
79− "/System/Library/PrivateFrameworks/AppleVPA.framework/Versions/A/AppleVPA"
80− "/System/Library/PrivateFrameworks/Backup.framework/Versions/A/Backup"
81− "/System/Library/PrivateFrameworks/ChunkingLibrary.framework/Versions/A/ChunkingLibrary"
82− "/System/Library/PrivateFrameworks/CommonAuth.framework/Versions/A/CommonAuth"
83− "/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/CoreSymbolication"
84− "/System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI"
85− "/System/Library/PrivateFrameworks/CoreWiFi.framework/Versions/A/CoreWiFi"
86− "/System/Library/PrivateFrameworks/CrashReporterSupport.framework/Versions/A/CrashReporterSupport"
87− "/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore"
88− "/System/Library/PrivateFrameworks/DebugSymbols.framework/Versions/A/DebugSymbols"
89− "/System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv"
90− "/System/Library/PrivateFrameworks/FaceCore.framework/Versions/A/FaceCore"
91− "/System/Library/PrivateFrameworks/GenerationalStorage.framework/Versions/A/GenerationalStorage"
92− "/System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal"
93− "/System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices"
94− "/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling"
95− "/System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport"
96− "/System/Library/PrivateFrameworks/NetAuth.framework/Versions/A/NetAuth"
97− "/System/Library/PrivateFrameworks/PerformanceAnalysis.framework/Versions/A/PerformanceAnalysis"
98− "/System/Library/PrivateFrameworks/RemoteViewServices.framework/Versions/A/RemoteViewServices"
99− "/System/Library/PrivateFrameworks/Sharing.framework/Versions/A/Sharing"
100− "/System/Library/PrivateFrameworks/SpeechRecognitionCore.framework/Versions/A/SpeechRecognitionCore"
101− "/System/Library/PrivateFrameworks/Symbolication.framework/Versions/A/Symbolication"
102− "/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC"
103− "/System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation"
104− "/System/Library/PrivateFrameworks/login.framework/Versions/A/Frameworks/loginsupport.framework/Versions/A/loginsupport"
105− "/usr/lib/libCRFSuite.dylib"
106− "/usr/lib/libOpenScriptingUtil.dylib"
107− "/usr/lib/libarchive.2.dylib"
108− "/usr/lib/libbsm.0.dylib"
109− "/usr/lib/libbz2.1.0.dylib"
110− "/usr/lib/libc++.1.dylib"
111− "/usr/lib/libc++abi.dylib"
112− "/usr/lib/libcmph.dylib"
113− "/usr/lib/libcups.2.dylib"
114− "/usr/lib/libextension.dylib"
115− "/usr/lib/libheimdal-asn1.dylib"
116− "/usr/lib/libiconv.2.dylib"
117− "/usr/lib/libicucore.A.dylib"
118− "/usr/lib/liblangid.dylib"
119− "/usr/lib/liblzma.5.dylib"
120− "/usr/lib/libmecabra.dylib"
121− "/usr/lib/libpam.2.dylib"
122− "/usr/lib/libresolv.9.dylib"
123− "/usr/lib/libsqlite3.dylib"
124− "/usr/lib/libxar.1.dylib"
125− "/usr/lib/libxml2.2.dylib"
126− "/usr/lib/libxslt.1.dylib"
127− "/usr/lib/libz.1.dylib"
128−]
pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/GNUmakefiledeleted−10
@@ -1,10 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_keychain
4−
5−security_keychain_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_keychain_HEADER_FILES_DIR = lib
7−
8−security_keychain_CC_FILES = $(wildcard lib/*.cpp)
9−
10−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_keychain/default.nixdeleted−43
@@ -1,43 +0,0 @@
1−{ CF, appleDerivation, apple_sdk, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_ocspd, libsecurity_pkcs12, libsecurity_utilities, libsecurityd, openssl, osx_private_sdk, security_dotmac_tp, lib }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_utilities
5− libsecurity_cdsa_client
6− libsecurity_cdsa_utilities
7− libsecurityd
8− CF
9− libsecurity_asn1
10− libsecurity_pkcs12
11− libsecurity_cdsa_utils
12− openssl
13− libsecurity_ocspd
14− security_dotmac_tp
15− ];
16− patchPhase = ''
17− substituteInPlace lib/Keychains.cpp --replace DLDbListCFPref.h DLDBListCFPref.h
18−
19− substituteInPlace lib/SecCertificate.cpp --replace '#include <Security/SecCertificatePriv.h>' ""
20−
21− cp ${osx_private_sdk}/include/xpc/private.h xpc
22− cp ${lib.getDev apple_sdk.sdk}/include/xpc/*.h xpc
23− cp ${osx_private_sdk}/include/sandbox_private.h lib/sandbox.h
24−
25− substituteInPlace lib/SecItemPriv.h \
26− --replace "extern CFTypeRef kSecAttrAccessGroup" "extern const CFTypeRef kSecAttrAccessGroup" \
27− --replace "extern CFTypeRef kSecAttrIsSensitive" "extern const CFTypeRef kSecAttrIsSensitive" \
28− --replace "extern CFTypeRef kSecAttrIsExtractable" "extern const CFTypeRef kSecAttrIsExtractable"
29−
30− substituteInPlace lib/Keychains.cpp --replace \
31− '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \
32− '"${apple_sdk.sdk.out}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
33−
34− substituteInPlace lib/CertificateValues.cpp --replace \
35− '#include <Security/SecCertificatePriv.h>' ""
36−
37− substituteInPlace lib/DLDBListCFPref.cpp --replace \
38− 'dispatch_once_t AppSandboxChecked;' ''$'namespace Security {\ndispatch_once_t AppSandboxChecked;' \
39− --replace 'return mLoginDLDbIdentifier;' 'return mLoginDLDbIdentifier; }' \
40− --replace '_xpc_runtime_is_app_sandboxed()' 'false'
41− # hope that doesn't hurt anything
42− '';
43−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_mds/GNUmakefiledeleted−10
@@ -1,10 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_mds
4−
5−security_mds_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_mds_HEADER_FILES_DIR = lib
7−
8−security_mds_CC_FILES = $(wildcard lib/*.cpp)
9−
10−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_mds/default.nixdeleted−11
@@ -1,11 +0,0 @@
1−{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_filedb, libsecurity_utilities, libsecurityd }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_cdsa_plugin
5− libsecurity_cdsa_utilities
6− libsecurity_filedb
7− libsecurity_utilities
8− libsecurity_cdsa_client
9− libsecurityd
10− ];
11−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/GNUmakefiledeleted−10
@@ -1,10 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_ocspd
4−
5−security_ocspd_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_ocspd_HEADER_FILES_DIR = lib
7−
8−security_ocspd_CC_FILES = $(wildcard lib/*.cpp)
9−
10−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_ocspd/default.nixdeleted−20
@@ -1,20 +0,0 @@
1−{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_utilities, libsecurity_utilities }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_utilities
5− libsecurity_cdsa_utilities
6− bootstrap_cmds
7− ];
8− postUnpack = ''
9− pushd libsecurity*
10− ls -lah
11− mkdir -p lib
12− cp common/* lib
13− cp client/* lib
14− popd
15− '';
16− preBuild = ''
17− make -f mig/mig.mk SRCROOT=. BUILT_PRODUCTS_DIR=. || exit 1
18− cp derived_src/* lib
19− '';
20−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/GNUmakefiledeleted−11
@@ -1,11 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_pkcs12
4−
5−security_pkcs12_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_pkcs12_HEADER_FILES_DIR = lib
7−
8−security_pkcs12_CC_FILES = $(wildcard lib/*.cpp)
9−security_pkcs12_C_FILES = $(wildcard lib/*.c)
10−
11−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_pkcs12/default.nixdeleted−15
@@ -1,15 +0,0 @@
1−{ appleDerivation, libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_utils, libsecurity_keychain }:
2−appleDerivation {
3− patchPhase = ''
4− substituteInPlace lib/pkcsoids.h --replace '#error' '#warning'
5− '';
6− preBuild = ''
7− unpackFile ${libsecurity_keychain.src}
8− mv libsecurity_keychain*/lib security_keychain
9− '';
10− buildInputs = [
11− libsecurity_asn1
12− libsecurity_cdsa_utils
13− libsecurity_cdsa_client
14− ];
15−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_sd_cspdl/GNUmakefiledeleted−10
@@ -1,10 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_sd_cspdl
4−
5−security_sd_cspdl_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_sd_cspdl_HEADER_FILES_DIR = lib
7−
8−security_sd_cspdl_CC_FILES = $(wildcard lib/*.cpp)
9−
10−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_sd_cspdl/default.nixdeleted−10
@@ -1,10 +0,0 @@
1−{ appleDerivation, libsecurity_cdsa_client, libsecurity_cdsa_plugin, libsecurity_cdsa_utilities, libsecurity_utilities, libsecurityd }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_cdsa_plugin
5− libsecurity_utilities
6− libsecurity_cdsa_utilities
7− libsecurityd
8− libsecurity_cdsa_client
9− ];
10−}
pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/GNUmakefiledeleted−11
@@ -1,11 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_utilities
4−
5−security_utilities_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_utilities_HEADER_FILES_DIR = lib
7−
8−security_utilities_C_FILES = $(wildcard lib/*.c)
9−security_utilities_CC_FILES = $(wildcard lib/*.cpp)
10−
11−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurity_utilities/default.nixdeleted−28
@@ -1,28 +0,0 @@
1−{ IOKit, appleDerivation, apple_sdk, libauto, libobjc, sqlite, stdenv, osx_private_sdk }:
2−appleDerivation {
3− buildInputs = [
4− libauto
5− libobjc
6− IOKit
7− ];
8− propagatedBuildInputs = [
9− sqlite
10− apple_sdk.frameworks.PCSC
11− ];
12− NIX_LDFLAGS = "-framework PCSC";
13− patchPhase = ''
14− substituteInPlace lib/errors.h --replace \
15− '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacTypes.h>' \
16− '"MacTypes.h"'
17− substituteInPlace lib/debugging.cpp --replace PATH_MAX 1024
18− substituteInPlace lib/superblob.h --replace 'result->at' 'result->template at'
19− substituteInPlace lib/ccaudit.cpp --replace '<bsm/libbsm.h>' '"bsm/libbsm.h"'
20− substituteInPlace lib/powerwatch.h --replace \
21− '<IOKit/pwr_mgt/IOPMLibPrivate.h>' \
22− '"${IOKit}/Library/Frameworks/IOKit.framework/Headers/pwr_mgt/IOPMLibPrivate.h"'
23− cp -R ${osx_private_sdk}/include/bsm lib
24− cp ${osx_private_sdk}/include/utilities_dtrace.h lib
25− '' + stdenv.lib.optionalString (!stdenv.cc.nativeLibc) ''
26− substituteInPlace lib/vproc++.cpp --replace /usr/local/include/vproc_priv.h ${stdenv.libc}/include/vproc_priv.h
27− '';
28−}
pkgs/os-specific/darwin/apple-source-releases/libsecurityd/GNUmakefiledeleted−11
@@ -1,11 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = securityd
4−
5−securityd_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−securityd_HEADER_FILES_DIR = lib
7−
8−securityd_CC_FILES = $(wildcard lib/*.cpp)
9−securityd_C_FILES = $(wildcard lib/*.c)
10−
11−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/libsecurityd/default.nixdeleted−23
@@ -1,23 +0,0 @@
1−{ appleDerivation, bootstrap_cmds, libsecurity_cdsa_client, libsecurity_cdsa_utilities, libsecurity_utilities }:
2−appleDerivation {
3− buildInputs = [
4− libsecurity_cdsa_utilities
5− libsecurity_utilities
6− bootstrap_cmds
7− ];
8− patchPhase = ''
9− unpackFile ${libsecurity_cdsa_client.src}
10− mv libsecurity_cdsa_client*/lib security_cdsa_client
11− ln -s lib securityd_client
12−
13− patch -p1 < ${./xdr-arity.patch}
14− '';
15− preBuild = ''
16− make -f mig/mig.mk SRCROOT=. BUILT_PRODUCTS_DIR=.
17− cp derived_src/* lib
18− rm lib/ucspClientC.c
19− '';
20− postFixup = ''
21− ln -s $dev/include/securityd $dev/include/securityd_client
22− '';
23−}
pkgs/os-specific/darwin/apple-source-releases/libsecurityd/xdr-arity.patchdeleted−79
@@ -1,79 +0,0 @@
1−diff --git a/lib/sec_xdr.c b/lib/sec_xdr.c
2−index fe5f038..6239b6c 100644
3−--- a/lib/sec_xdr.c
4−+++ b/lib/sec_xdr.c
5−@@ -223,7 +223,7 @@ bool_t copyin(void *data, xdrproc_t proc, void** copy, u_int *size)
6− sec_xdrmem_create(&xdr, (char *)xdr_data, length, XDR_ENCODE);
7−
8− // cast to void* - function can go both ways (xdr->x_op)
9−- if (proc(&xdr, data)) {
10−+ if (proc(&xdr, data, 0)) {
11− *copy = xdr_data;
12− if (size) *size = length;
13− return (TRUE);
14−@@ -261,7 +261,7 @@ bool_t copyout(const void *copy, u_int size, xdrproc_t proc, void **data, u_int
15− if (!sec_xdr_arena_init(&arena, &xdr, length_out ? length_out : length_required, length_out ? *data : NULL))
16− return (FALSE);
17−
18−- if (proc(&xdr, data))
19−+ if (proc(&xdr, data, 0))
20− {
21− *length = length_required;
22− return (TRUE);
23−@@ -284,7 +284,7 @@ bool_t copyout_chunked(const void *copy, u_int size, xdrproc_t proc, void **data
24−
25− void *data_out = NULL;
26−
27−- if (proc(&xdr, &data_out))
28−+ if (proc(&xdr, &data_out, 0))
29− {
30− *data = data_out;
31− return (TRUE);
32−diff --git a/lib/sec_xdr_array.c b/lib/sec_xdr_array.c
33−index 152a71b..e5ec1ad 100644
34−--- a/lib/sec_xdr_array.c
35−+++ b/lib/sec_xdr_array.c
36−@@ -147,7 +147,7 @@ sec_xdr_array(XDR *xdrs, uint8_t **addrp, u_int *sizep, u_int maxsize, u_int els
37− for (i = 0; (i < c) && stat; i++) {
38− if ((xdrs->x_op == XDR_DECODE) && sizeof_alloc)
39− memset(obj, 0, elsize);
40−- stat = (*elproc)(xdrs, target);
41−+ stat = (*elproc)(xdrs, target, 0);
42− if ((xdrs->x_op == XDR_ENCODE) || !sizeof_alloc)
43− target += elsize;
44− }
45−diff --git a/lib/sec_xdr_reference.c b/lib/sec_xdr_reference.c
46−index a66fb37..ab5b4c4 100644
47−--- a/lib/sec_xdr_reference.c
48−+++ b/lib/sec_xdr_reference.c
49−@@ -121,7 +121,7 @@ sec_xdr_reference(XDR *xdrs, uint8_t **pp, u_int size, xdrproc_t proc)
50− break;
51− }
52−
53−- stat = (*proc)(xdrs, loc);
54−+ stat = (*proc)(xdrs, loc, 0);
55−
56− if (xdrs->x_op == XDR_FREE) {
57− sec_mem_free(xdrs, loc, size);
58−diff --git a/lib/sec_xdr_sizeof.c b/lib/sec_xdr_sizeof.c
59−index a18bcd0..8c33dbc 100644
60−--- a/lib/sec_xdr_sizeof.c
61−+++ b/lib/sec_xdr_sizeof.c
62−@@ -190,7 +190,7 @@ sec_xdr_sizeof_in(func, data)
63−
64− sec_xdr_arena_allocator_t size_alloc;
65− sec_xdr_arena_init_size_alloc(&size_alloc, &x);
66−- stat = func(&x, data);
67−+ stat = func(&x, data, 0);
68− if (x.x_private)
69− free(x.x_private);
70− return (stat == TRUE ? (unsigned) x.x_handy: 0);
71−@@ -210,7 +210,7 @@ sec_xdr_sizeof_out(copy, size, func, data)
72−
73− sec_xdr_arena_allocator_t size_alloc;
74− sec_xdr_arena_init_size_alloc(&size_alloc, &x);
75−- stat = func(&x, data);
76−+ stat = func(&x, data, 0);
77− if (size_alloc.data)
78− free(size_alloc.data);
79− return (stat == TRUE ? (unsigned long)size_alloc.offset : 0);
pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix+23−3
@@ -1,13 +1,33 @@
1−{ stdenv, appleDerivation }:
1+{ stdenv, lib, appleDerivation, xcbuildHook
2+
3+# headersOnly is true when building for libSystem
4+, headersOnly ? false }:
25
3−# all symbols are located in libSystem
46appleDerivation {
7+ nativeBuildInputs = lib.optional (!headersOnly) xcbuildHook;
8+
9+ prePatch = ''
10+ substituteInPlace tzlink.c \
11+ --replace '#include <xpc/xpc.h>' ""
12+ '';
13+
14+ xcbuildFlags = "-target util";
15+
516 installPhase = ''
617 mkdir -p $out/include
18+ '' + lib.optionalString headersOnly ''
719 cp *.h $out/include
20+ '' + lib.optionalString (!headersOnly)''
21+ mkdir -p $out/lib $out/include
22+
23+ cp Products/Release/*.dylib $out/lib
24+ cp Products/Release/*.h $out/include
25+
26+ # TODO: figure out how to get this to be right the first time around
27+ install_name_tool -id $out/lib/libutil.dylib $out/lib/libutil.dylib
828 '';
929
10− meta = with stdenv.lib; {
30+ meta = with lib; {
1131 maintainers = with maintainers; [ copumpkin ];
1232 platforms = platforms.darwin;
1333 license = licenses.apsl20;
pkgs/os-specific/darwin/apple-source-releases/libutil/new.nixdeleted−29
@@ -1,29 +0,0 @@
1−{ stdenv, appleDerivation, xcbuildHook }:
2−
3−# TODO: make this the official libutil expression once we've integrated xcbuild in the bootstrap
4−appleDerivation {
5− nativeBuildInputs = [ xcbuildHook ];
6−
7− prePatch = ''
8− substituteInPlace tzlink.c \
9− --replace '#include <xpc/xpc.h>' ""
10− '';
11−
12− xcbuildFlags = "-target util";
13−
14− installPhase = ''
15− mkdir -p $out/lib $out/include
16−
17− cp Products/Release/*.dylib $out/lib
18− cp Products/Release/*.h $out/include
19−
20− # TODO: figure out how to get this to be right the first time around
21− install_name_tool -id $out/lib/libutil.dylib $out/lib/libutil.dylib
22− '';
23−
24− meta = with stdenv.lib; {
25− maintainers = with maintainers; [ copumpkin ];
26− platforms = platforms.darwin;
27− license = licenses.apsl20;
28− };
29−}
pkgs/os-specific/darwin/apple-source-releases/security_dotmac_tp/GNUmakefiledeleted−8
@@ -1,8 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−LIBRARY_NAME = security_dotmac_tp
4−
5−security_dotmac_tp_HEADER_FILES = $(notdir $(wildcard lib/*.h))
6−security_dotmac_tp_HEADER_FILES_DIR = lib
7−
8−include $(GNUSTEP_MAKEFILES)/library.make
pkgs/os-specific/darwin/apple-source-releases/security_dotmac_tp/default.nixdeleted−4
@@ -1,4 +0,0 @@
1−{ appleDerivation }:
2−
3−appleDerivation {
4−}
pkgs/os-specific/darwin/apple-source-releases/security_systemkeychain/default.nixdeleted−32
@@ -1,32 +0,0 @@
1−{ appleDerivation, xcbuildHook, Security
2−, libsecurity_codesigning, libsecurity_utilities, libsecurity_cdsa_utilities
3−, xnu, osx_private_sdk, pcsclite}:
4−
5−appleDerivation {
6− nativeBuildInputs = [ xcbuildHook ];
7− buildInputs = [ Security libsecurity_utilities
8− libsecurity_cdsa_utilities libsecurity_codesigning
9− pcsclite ];
10−
11− NIX_LDFLAGS = "-lpcsclite";
12−
13− # can't build the whole thing
14− xcbuildFlags = "-target codesign";
15−
16− preBuild = ''
17− mkdir -p include/Security
18− cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/System/Library/Frameworks/Security.framework/PrivateHeaders/*.h include/Security
19− cp ${osx_private_sdk.src}/PrivateSDK10.10.sparse.sdk/System/Library/Frameworks/Security.framework/Headers/*.h include/Security
20−
21− unpackFile ${xnu.src}
22− mkdir -p include/sys
23− cp -r xnu-*/bsd/sys/codesign.h include/sys/codesign.h
24− '';
25−
26− NIX_CFLAGS_COMPILE = "-Iinclude";
27−
28− installPhase = ''
29− mkdir -p $out/bin
30− cp Products/Release/codesign $out/bin/codesign
31− '';
32−}
pkgs/os-specific/darwin/apple-source-releases/top/default.nix+2−2
@@ -1,8 +1,8 @@
1−{xcbuildHook, appleDerivation, apple_sdk, ncurses, libutil-new, lib}:
1+{xcbuildHook, appleDerivation, apple_sdk, ncurses, libutil, lib}:
22
33appleDerivation {
44 nativeBuildInputs = [ xcbuildHook ];
5− buildInputs = [ apple_sdk.frameworks.IOKit ncurses libutil-new ];
5+ buildInputs = [ apple_sdk.frameworks.IOKit ncurses libutil ];
66 NIX_LDFLAGS = "-lutil";
77 installPhase = ''
88 install -D Products/Release/libtop.a $out/lib/libtop.a
pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix+50−43
@@ -1,11 +1,11 @@
1−{ appleDerivation, bootstrap_cmds, bison, flex, gnum4, unifdef, perl, python }:
1+{ appleDerivation, lib, bootstrap_cmds, bison, flex
2+, gnum4, unifdef, perl, python
3+, headersOnly ? true }:
24
3−appleDerivation {
4− phases = [ "unpackPhase" "patchPhase" "installPhase" ];
5+appleDerivation ({
6+ nativeBuildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl python ];
57
6− buildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl python ];
7−
8− patchPhase = ''
8+ postPatch = ''
99 substituteInPlace Makefile \
1010 --replace "/bin/" "" \
1111 --replace "MAKEJOBS := " '# MAKEJOBS := '
@@ -40,7 +40,27 @@ appleDerivation {
4040 patchShebangs .
4141 '';
4242
43− installPhase = ''
43+ PLATFORM = "MacOSX";
44+ SDKVERSION = "10.11";
45+ CC = "cc";
46+ CXX = "c++";
47+ MIG = "mig";
48+ MIGCOM = "migcom";
49+ STRIP = "strip";
50+ NM = "nm";
51+ UNIFDEF = "unifdef";
52+ DSYMUTIL = "dsymutil";
53+ HOST_OS_VERSION = "10.10";
54+ HOST_CC = "cc";
55+ HOST_FLEX = "flex";
56+ HOST_BISON = "bison";
57+ HOST_GM4 = "m4";
58+ MIGCC = "cc";
59+ ARCHS = "x86_64";
60+
61+ NIX_CFLAGS_COMPILE = "-Wno-error";
62+
63+ preBuild = ''
4464 # This is a bit of a hack...
4565 mkdir -p sdk/usr/local/libexec
4666
@@ -56,49 +76,27 @@ appleDerivation {
5676
5777 export SDKROOT_RESOLVED=$PWD/sdk
5878 export HOST_SDKROOT_RESOLVED=$PWD/sdk
59− export PLATFORM=MacOSX
60− export SDKVERSION=10.11
61−
62− export CC=cc
63− export CXX=c++
64− export MIG=${bootstrap_cmds}/bin/mig
65− export MIGCOM=${bootstrap_cmds}/libexec/migcom
66− export STRIP=sentinel-missing
67− export LIPO=sentinel-missing
68− export LIBTOOL=sentinel-missing
69− export NM=sentinel-missing
70− export UNIFDEF=${unifdef}/bin/unifdef
71− export DSYMUTIL=sentinel-missing
72− export CTFCONVERT=sentinel-missing
73− export CTFMERGE=sentinel-missing
74− export CTFINSERT=sentinel-missing
75− export NMEDIT=sentinel-missing
76−
77− export HOST_OS_VERSION=10.7
78− export HOST_CC=cc
79− export HOST_FLEX=${flex}/bin/flex
80− export HOST_BISON=${bison}/bin/bison
81− export HOST_GM4=${gnum4}/bin/m4
82− export HOST_CODESIGN='echo dummy_codesign'
83− export HOST_CODESIGN_ALLOCATE=echo
8479
8580 export BUILT_PRODUCTS_DIR=.
86−
8781 export DSTROOT=$out
88− make installhdrs
82+ '';
8983
84+ buildFlags = lib.optionalString headersOnly "exporthdrs";
85+ installTargets = lib.optionalString headersOnly "installhdrs";
86+
87+ postInstall = lib.optionalString headersOnly ''
9088 mv $out/usr/include $out
9189
90+ (cd BUILD/obj/EXPORT_HDRS && find -type f -exec install -D \{} $out/include/\{} \;)
91+
9292 # TODO: figure out why I need to do this
9393 cp libsyscall/wrappers/*.h $out/include
94− mkdir -p $out/include/os
95− cp libsyscall/os/tsd.h $out/include/os/tsd.h
94+ install -D libsyscall/os/tsd.h $out/include/os/tsd.h
9695 cp EXTERNAL_HEADERS/AssertMacros.h $out/include
9796 cp EXTERNAL_HEADERS/Availability*.h $out/System/Library/Frameworks/Kernel.framework/Versions/A/Headers/
97+ cp -r EXTERNAL_HEADERS/corecrypto $out/include
9898
9999 # Build the mach headers we crave
100− export MIGCC=cc
101− export ARCHS="x86_64"
102100 export SRCROOT=$PWD/libsyscall
103101 export DERIVED_SOURCES_DIR=$out/include
104102 export SDKROOT=$out
@@ -108,14 +106,13 @@ appleDerivation {
108106
109107 # Get rid of the System prefix
110108 mv $out/System/* $out/
109+ rmdir $out/System
111110
112111 # TODO: do I need this?
113112 mv $out/internal_hdr/include/mach/*.h $out/include/mach
114113
115114 # Get rid of some junk lying around
116− rm -rf $out/internal_hdr
117− rm -rf $out/usr
118− rm -rf $out/local
115+ rm -rf $out/internal_hdr $out/usr $out/local
119116
120117 # Add some symlinks
121118 ln -s $out/Library/Frameworks/System.framework/Versions/B \
@@ -123,8 +120,18 @@ appleDerivation {
123120 ln -s $out/Library/Frameworks/System.framework/Versions/Current/PrivateHeaders \
124121 $out/Library/Frameworks/System.framework/Headers
125122
126− # IOKit (and possibly the others) is incomplete, so let's not make it visible from here...
123+ # IOKit (and possibly the others) is incomplete,
124+ # so let's not make it visible from here...
127125 mkdir $out/Library/PrivateFrameworks
128126 mv $out/Library/Frameworks/IOKit.framework $out/Library/PrivateFrameworks
129127 '';
130−}
128+} // lib.optionalAttrs headersOnly {
129+ HOST_CODESIGN = "echo";
130+ HOST_CODESIGN_ALLOCATE = "echo";
131+ LIPO = "echo";
132+ LIBTOOL = "echo";
133+ CTFCONVERT = "echo";
134+ CTFMERGE = "echo";
135+ CTFINSERT = "echo";
136+ NMEDIT = "echo";
137+})
pkgs/os-specific/darwin/binutils/default.nix+1−1
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
3535 ln -sf "${cctools}/bin/$i" "$out/bin/$i"
3636 done
3737
38− ln -s ${llvm}/bin/llvm-dsymutil $out/bin/dsymutil
38+ ln -s ${llvm}/bin/dsymutil $out/bin/dsymutil
3939
4040 ln -s ${binutils-unwrapped.out}/share $out/share
4141
pkgs/os-specific/darwin/cctools/apfs.patchnew file+22
@@ -0,0 +1,22 @@
1+diff --git a/cctools/ld64/src/ld/OutputFile.cpp b/cctools/ld64/src/ld/OutputFile.cpp
2+index 8859882..158c7d2 100644
3+--- a/cctools/ld64/src/ld/OutputFile.cpp
4++++ b/cctools/ld64/src/ld/OutputFile.cpp
5+@@ -2786,7 +2786,7 @@ void OutputFile::writeOutputFile(ld::Internal& state)
6+ #ifdef __APPLE__ // ld64-port
7+ struct statfs fsInfo;
8+ if ( statfs(_options.outputFilePath(), &fsInfo) != -1 ) {
9+- if ( strcmp(fsInfo.f_fstypename, "hfs") == 0) {
10++ if ( (strcmp(fsInfo.f_fstypename, "hfs") == 0) || (strcmp(fsInfo.f_fstypename, "apfs") == 0) ) {
11+ (void)unlink(_options.outputFilePath());
12+ outputIsMappableFile = true;
13+ }
14+@@ -2814,7 +2814,7 @@ void OutputFile::writeOutputFile(ld::Internal& state)
15+ #ifdef __APPLE__ // ld64-port
16+ struct statfs fsInfo;
17+ if ( statfs(dirPath, &fsInfo) != -1 ) {
18+- if ( strcmp(fsInfo.f_fstypename, "hfs") == 0) {
19++ if ( (strcmp(fsInfo.f_fstypename, "hfs") == 0) || (strcmp(fsInfo.f_fstypename, "apfs") == 0) ) {
20+ outputIsMappableFile = true;
21+ }
22+ }
pkgs/os-specific/darwin/cctools/ld-tbd-v2.patchdeleted−98
@@ -1,98 +0,0 @@
1−diff --git a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
2−index 09c0e12..ac6b085 100644
3−--- a/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
4−+++ b/cctools/ld64/src/ld/parsers/textstub_dylib_file.cpp
5−@@ -187,6 +187,7 @@ struct DynamicLibrary {
6− ld::File::ObjcConstraint _objcConstraint;
7− Options::Platform _platform;
8− std::vector<Token> _allowedClients;
9−+ std::vector<Token> _allowableClients;
10− std::vector<Token> _reexportedLibraries;
11− std::vector<Token> _symbols;
12− std::vector<Token> _classes;
13−@@ -246,6 +247,14 @@ class TBDFile {
14− });
15− }
16−
17−+ void parseAllowableClients(DynamicLibrary& lib) {
18−+ if ( !hasOptionalToken("allowable-clients") )
19−+ return;
20−+ parseFlowSequence([&](Token name) {
21−+ lib._allowableClients.emplace_back(name);
22−+ });
23−+ }
24−+
25− void parseReexportedDylibs(DynamicLibrary& lib) {
26− if ( !hasOptionalToken("re-exports") )
27− return;
28−@@ -306,6 +315,21 @@ class TBDFile {
29− return false;
30− }
31−
32−+ void skipUUIDs(DynamicLibrary& lib) {
33−+ expectToken("uuids");
34−+ while ( true ) {
35−+ auto token = next();
36−+ if ( token == "]" )
37−+ break;
38−+ }
39−+ }
40−+
41−+ void skipParentUmbrella(DynamicLibrary& lib) {
42−+ if (!hasOptionalToken("parent-umbrella"))
43−+ return;
44−+ next();
45−+ }
46−+
47− void parsePlatform(DynamicLibrary& lib) {
48− expectToken("platform");
49−
50−@@ -410,6 +434,7 @@ class TBDFile {
51− }
52−
53− parseAllowedClients(lib);
54−+ parseAllowableClients(lib);
55− parseReexportedDylibs(lib);
56− parseSymbols(lib);
57− if ( !hasOptionalToken("-") )
58−@@ -455,17 +480,21 @@ class TBDFile {
59− return result.front();
60− }
61−
62−- void parseDocument(DynamicLibrary& lib, std::string &requestedArchName) {
63−+ void parseDocument(DynamicLibrary& lib, std::string &requestedArchName, bool isTbdV2) {
64− auto selectedArchName = parseAndSelectArchitecture(requestedArchName);
65− if (selectedArchName.empty())
66− throwf("invalid arch");
67−
68−+ if(isTbdV2)
69−+ skipUUIDs(lib);
70− parsePlatform(lib);
71− parseInstallName(lib);
72− parseCurrentVersion(lib);
73− parseCompatibilityVersion(lib);
74− parseSwiftVersion(lib);
75− parseObjCConstraint(lib);
76−+ if(isTbdV2)
77−+ skipParentUmbrella(lib);
78− parseExportsBlock(lib, selectedArchName);
79− }
80−
81−@@ -476,7 +505,8 @@ public:
82− _tokenizer.reset();
83− DynamicLibrary lib;
84− expectToken("---");
85−- parseDocument(lib, requestedArchName);
86−+ auto isTbdV2 = hasOptionalToken("!tapi-tbd-v2");
87−+ parseDocument(lib, requestedArchName, isTbdV2);
88− expectToken("...");
89− return lib;
90− }
91−@@ -486,6 +516,7 @@ public:
92− auto token = next();
93− if ( token != "---" )
94− return false;
95−+ hasOptionalToken("!tapi-tbd-v2");
96− return !parseAndSelectArchitecture(requestedArchName).empty();
97− }
98−
pkgs/os-specific/darwin/cctools/port.nix+22−42
@@ -1,18 +1,11 @@
1−{ stdenv, fetchFromGitHub, autoconf, automake, libtool_2, autoreconfHook
1+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook
22, libcxxabi, libuuid, llvm
33, libobjc ? null, maloader ? null
4−, enableDumpNormalizedLibArgs ? false
4+, enableTapiSupport ? true, libtapi
55}:
66
77let
88
9− # We need to use an old version of cctools-port to support linking TBD files
10− # in the iOS SDK. Note that this only provides support for SDK versions up to
11− # 10.x. For 11.0 and higher we will need to upgrade to a newer cctools than the
12− # default version here, which can support the new TBD format via Apple's
13− # libtapi.
14− useOld = stdenv.targetPlatform.isiOS;
15−
169 # The targetPrefix prepended to binary names to allow multiple binuntils on the
1710 # PATH to both be usable.
1811 targetPrefix = stdenv.lib.optionalString
@@ -23,47 +16,28 @@ in
2316# Non-Darwin alternatives
2417assert (!stdenv.hostPlatform.isDarwin) -> maloader != null;
2518
26−assert enableDumpNormalizedLibArgs -> (!useOld);
27−
2819let
2920 baseParams = rec {
3021 name = "${targetPrefix}cctools-port-${version}";
31− version = if useOld then "886" else "895";
22+ version = "895";
3223
33− src = fetchFromGitHub (if enableDumpNormalizedLibArgs then {
34− owner = "tpoechtrager";
35− repo = "cctools-port";
36− # master with https://github.com/tpoechtrager/cctools-port/pull/34
37− rev = "8395d4b2c3350356e2fb02f5e04f4f463c7388df";
38− sha256 = "10vbf1cfzx02q8chc77s84fp2kydjpx2y682mr6mrbb7sq5rwh8f";
39− } else if useOld then {
40− owner = "tpoechtrager";
41− repo = "cctools-port";
42− rev = "02f0b8ecd87a3951653d838a321ae744815e21a5";
43− sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1";
44− } else {
24+ src = fetchFromGitHub {
4525 owner = "tpoechtrager";
4626 repo = "cctools-port";
47− rev = "2e569d765440b8cd6414a695637617521aa2375b"; # From branch 895-ld64-274.2
48− sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52";
49− });
27+ rev = "07619027f8311fa61b4a549c75994b88739a82d8";
28+ sha256 = "12g94hhz5v5bmy2w0zb6fb4bjlmn992gygc60h9nai15kshj2spi";
29+ };
5030
5131 outputs = [ "out" "dev" ];
5232
53− nativeBuildInputs = [ autoconf automake libtool_2 autoreconfHook ];
33+ nativeBuildInputs = [ autoconf automake libtool autoreconfHook ];
5434 buildInputs = [ libuuid ]
55− ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];
56−
57− patches = [
58− ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch
59− ] ++ stdenv.lib.optionals useOld [
60− # See https://github.com/tpoechtrager/cctools-port/issues/24. Remove when that's fixed.
61− ./undo-unknown-triple.patch
62− ./ld-tbd-v2.patch
63− ./support-ios.patch
64− ];
35+ ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ]
36+ ++ stdenv.lib.optional enableTapiSupport libtapi;
6537
66− __propagatedImpureHostDeps = stdenv.lib.optionals (!useOld) [
38+ patches = [ ./ld-rpath-nonfinal.patch ./ld-ignore-rpath-link.patch ./apfs.patch ];
39+
40+ __propagatedImpureHostDeps = [
6741 # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them
6842 "/usr/lib/libobjc.A.dylib"
6943 "/usr/lib/libobjc.dylib"
@@ -74,9 +48,15 @@ let
7448 # TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
7549 configurePlatforms = [ "build" "host" ]
7650 ++ stdenv.lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
77− configureFlags = [ "--disable-clang-as" ];
78−
79− postPatch = ''
51+ configureFlags = [ "--disable-clang-as" ]
52+ ++ stdenv.lib.optionals enableTapiSupport [
53+ "--enable-tapi-support"
54+ "--with-libtapi=${libtapi}"
55+ ];
56+
57+ postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
58+ substituteInPlace cctools/Makefile.am --replace libobjc2 ""
59+ '' + ''
8060 sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp
8161
8262 # FIXME: there are far more absolute path references that I don't want to fix right now
pkgs/os-specific/darwin/cctools/support-ios.patchdeleted−13
@@ -1,13 +0,0 @@
1−diff --git a/cctools/configure.ac b/cctools/configure.ac
2−index 56e8f24..0b4b3ff 100644
3−--- a/cctools/configure.ac
4−+++ b/cctools/configure.ac
5−@@ -39,7 +39,7 @@ EXTRACXXFLAGS=""
6− WARNINGS=""
7−
8− case $host_os in
9−- darwin* )
10−+ darwin* | ios*)
11− isdarwin=yes
12− AM_CONDITIONAL([ISDARWIN], [true])
13− ;;
pkgs/os-specific/darwin/cctools/undo-unknown-triple.patchdeleted−17
@@ -1,17 +0,0 @@
1−diff --git a/cctools/as/driver.c b/cctools/as/driver.c
2−index b06d085..c03397a 100644
3−--- a/cctools/as/driver.c
4−+++ b/cctools/as/driver.c
5−@@ -363,12 +363,6 @@ char **envp)
6− /* Add -c or clang will run ld(1). */
7− new_argv[j] = "-c";
8− j++;
9−- /* cctools-port start */
10−- new_argv[j] = "-target";
11−- j++;
12−- new_argv[j] = "unknown-apple-darwin";
13−- j++;
14−- /* cctools-port end */
15− new_argv[j] = NULL;
16− if(execute(new_argv, verbose))
17− exit(0);
pkgs/os-specific/darwin/cf-private/default.nix+1−4
@@ -1,4 +1,4 @@
1−{ CF, apple_sdk, osx_private_sdk }:
1+{ CF, apple_sdk }:
22
33# cf-private is a bit weird, but boils down to CF with a weird setup-hook that
44# makes a build link against the system CoreFoundation rather than our pure one.
@@ -38,10 +38,7 @@ CF.overrideAttrs (orig: {
3838 # this is watchman, who can almost certainly switch to the pure CF once the header
3939 # and functionality is merged in.
4040 installPhase = orig.installPhase + ''
41− # Copy or overwrite private headers, some of these might already
42− # exist in CF but the private versions have more information.
4341 basepath="Library/Frameworks/CoreFoundation.framework/Headers"
44− cp -Lfv --no-preserve mode ${osx_private_sdk}/include/CoreFoundationPrivateHeaders/* "$out/$basepath"
4542
4643 # Append the include at top level or nobody will notice the header we're about to add
4744 sed -i '/CFNotificationCenter.h/a #include <CoreFoundation/CFFileDescriptor.h>' \
pkgs/os-specific/darwin/darling/default.nix+3
@@ -26,6 +26,9 @@ stdenv.mkDerivation rec {
2626 mkdir -p $out/lib
2727 cp -rL src/sandbox/include/ $out/
2828 cp libsystem_sandbox.dylib $out/lib/
29+
30+ mkdir -p $out/include
31+ cp src/libaks/include/* $out/include
2932 '';
3033
3134 # buildInputs = [ cmake bison flex ];
pkgs/os-specific/darwin/libtapi/default.nixnew file+29
@@ -0,0 +1,29 @@
1+{ lib, stdenv, fetchFromGitHub, cmake, python }:
2+
3+stdenv.mkDerivation {
4+ name = "libtapi";
5+ src = fetchFromGitHub {
6+ owner = "tpoechtrager";
7+ repo = "apple-libtapi";
8+ rev = "e56673694db395e25b31808b4fbb9a7005e6875f";
9+ sha256 = "1lnl1af9sszp9wxfk0wljrpdmwcx83j0w5c0y4qw4pqrdkdgwks7";
10+ };
11+
12+ nativeBuildInputs = [ cmake python ];
13+
14+ preConfigure = ''
15+ cd src/apple-llvm/src
16+ '';
17+
18+ cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=OFF" ];
19+
20+ buildFlags = "libtapi";
21+
22+ installTarget = "install-libtapi";
23+
24+ meta = with lib; {
25+ license = licenses.apsl20;
26+ maintainers = with maintainers; [ matthewbauer ];
27+ };
28+
29+}
pkgs/os-specific/darwin/osx-private-sdk/default.nixdeleted−27
@@ -1,27 +0,0 @@
1−{ stdenv, fetchFromGitHub }:
2−
3−stdenv.mkDerivation {
4− name = "OSXPrivateSDK";
5−
6− src = fetchFromGitHub {
7− owner = "samdmarshall";
8− repo = "OSXPrivateSDK";
9− rev = "f4d52b60e86b496abfaffa119a7d299562d99783";
10− sha256 = "0bv0884yxpvk2ishxj8gdy1w6wb0gwfq55q5qjp0s8z0z7f63zqh";
11− };
12−
13− # NOTE: we install only headers that are really needed to keep closure size
14− # reasonable.
15− installPhase = ''
16− mkdir -p $out/include
17− sdk10=PrivateSDK10.10.sparse.sdk
18− sdk=PrivateSDK10.9.sparse.sdk
19− cp $sdk/usr/local/include/sandbox_private.h $out/include/sandbox_private.h
20− # this can be removed once we dtrace binary
21− cp $sdk/usr/local/include/security_utilities/utilities_dtrace.h $out/include/utilities_dtrace.h
22− cp -RL $sdk/usr/include/xpc $out/include/xpc
23− cp -RL $sdk/usr/local/include/bsm $out/include/bsm
24− cp -RL $sdk/System/Library/Frameworks/Security.framework/Versions/A/PrivateHeaders $out/include/SecurityPrivateHeaders
25− cp -RL $sdk10/System/Library/Frameworks/CoreFoundation.framework/Headers $out/include/CoreFoundationPrivateHeaders
26− '';
27−}
pkgs/os-specific/darwin/security-tool/GNUmakefiledeleted−14
@@ -1,14 +0,0 @@
1−include $(GNUSTEP_MAKEFILES)/common.make
2−
3−TOOL_NAME = security
4−security_C_FILES = $(wildcard *.c)
5−security_CC_FILES = $(wildcard *.cpp)
6−
7−security_LDFLAGS = \
8− -lsecurity_cdsa_utilities -lsecurity_cdsa_utils -lsecurity_keychain -lsecurity_cssm \
9− -lsecurity_cdsa_client -lsecurity_utilities -lsecurity_asn1 -lsecurity_mds \
10− -lsecurity_cdsa_plugin -lsecurity_pkcs12 -lsecurity_apple_csp -lsecurity_apple_cspdl \
11− -lsecurity_apple_file_dl -lsecurity_apple_x509_cl -lsecurity_apple_x509_tp \
12− -lsecurity_sd_cspdl -lsecurity_filedb -lsecurityd -framework Security -framework PCSC
13−
14−include $(GNUSTEP_MAKEFILES)/tool.make
pkgs/os-specific/darwin/security-tool/default.nixdeleted−101
@@ -1,101 +0,0 @@
1−{ Foundation, PCSC, Security, GSS, Kerberos, makeWrapper, apple_sdk,
2−fetchurl, gnustep, libobjc, libsecurity_apple_csp, libsecurity_apple_cspdl,
3−libsecurity_apple_file_dl, libsecurity_apple_x509_cl, libsecurity_apple_x509_tp,
4−libsecurity_asn1, libsecurity_cdsa_client, libsecurity_cdsa_plugin,
5−libsecurity_cdsa_utilities, libsecurity_cdsa_utils, libsecurity_cssm, libsecurity_filedb,
6−libsecurity_keychain, libsecurity_mds, libsecurity_pkcs12, libsecurity_sd_cspdl,
7−libsecurity_utilities, libsecurityd, osx_private_sdk, Security-framework, stdenv }:
8−
9−stdenv.mkDerivation rec {
10− version = "55115";
11− name = "SecurityTool-${version}";
12−
13− src = fetchurl {
14− url = "http://opensource.apple.com/tarballs/SecurityTool/SecurityTool-${version}.tar.gz";
15− sha256 = "0apcz4vy2z5645jhrs60wj3w27mncjjqv42h5lln36g6qs2n9113";
16− };
17−
18− disallowedRequisites = [ apple_sdk.sdk ];
19−
20− patchPhase = ''
21− # copied from libsecurity_generic
22− cp -R ${osx_private_sdk}/include/SecurityPrivateHeaders Security
23−
24− substituteInPlace cmsutil.c --replace \
25− '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \
26− '"${apple_sdk.sdk.out}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
27− substituteInPlace createFVMaster.c --replace \
28− '<CoreServices/../Frameworks/CarbonCore.framework/Headers/MacErrors.h>' \
29− '"${apple_sdk.sdk.out}/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/Headers/MacErrors.h"'
30− '';
31−
32− postUnpack = ''
33− unpackFile ${Security.src}
34− cp Security-*/utilities/src/fileIo.c SecurityTool*
35− cp Security-*/utilities/src/fileIo.h SecurityTool*
36− '';
37−
38− preBuild = ''
39− makeFlagsArray=(-j$NIX_BUILD_CORES)
40− '';
41−
42− NIX_LDFLAGS = "-no_dtrace_dof";
43−
44− makeFlags = [
45− "-f ${./GNUmakefile}"
46− "MAKEFILE_NAME=${./GNUmakefile}"
47− "GNUSTEP_MAKEFILES=${gnustep.make}/share/GNUstep/Makefiles"
48− ];
49−
50− installFlags = [
51− "security_INSTALL_DIR=\$(out)/bin"
52− ];
53−
54− propagatedBuildInputs = [ GSS Kerberos Security-framework PCSC Foundation ];
55−
56− __propagatedImpureHostDeps = [ "/System/Library/Keychains" ];
57−
58− buildInputs = [
59− gnustep.make
60− libsecurity_asn1
61− libsecurity_utilities
62− libsecurity_cdsa_utilities
63− libobjc
64− libsecurity_cdsa_client
65− libsecurity_keychain
66− libsecurity_cssm
67− libsecurity_cdsa_utils
68− libsecurity_mds
69− libsecurity_cdsa_plugin
70− libsecurity_apple_csp
71− libsecurity_apple_cspdl
72− libsecurity_apple_file_dl
73− libsecurity_apple_x509_cl
74− libsecurity_apple_x509_tp
75− libsecurity_pkcs12
76− libsecurity_sd_cspdl
77− libsecurity_filedb
78− libsecurityd
79− makeWrapper
80− ];
81−
82− NIX_CFLAGS_COMPILE = [
83− "-F${Security}/Library/Frameworks"
84− "-F${PCSC}/Library/Frameworks"
85− "-Wno-deprecated-declarations"
86− ];
87−
88− postInstall = ''
89− wrapProgram $out/bin/security --set DYLD_INSERT_LIBRARIES /usr/lib/libsqlite3.dylib
90− '';
91−
92− meta = with stdenv.lib; {
93− description = "Command line interface to macOS keychains and Security framework";
94− maintainers = with maintainers; [
95− copumpkin
96− joelteon
97− ];
98− platforms = platforms.darwin;
99− license = licenses.apsl20;
100− };
101−}
pkgs/stdenv/darwin/default.nix+26−25
@@ -132,9 +132,6 @@ in rec {
132132 extraAttrs = {
133133 inherit platform;
134134 parent = last;
135−
136− # This is used all over the place so I figured I'd just leave it here for now
137− secure-format-patch = ./darwin-secure-format.patch;
138135 };
139136 overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
140137 };
@@ -158,7 +155,7 @@ in rec {
158155 dyld = bootstrapTools;
159156 };
160157
161− llvmPackages_5 = {
158+ llvmPackages_7 = {
162159 libcxx = stdenv.mkDerivation {
163160 name = "bootstrap-stage0-libcxx";
164161 phases = [ "installPhase" "fixupPhase" ];
@@ -200,7 +197,12 @@ in rec {
200197 python2 = self.python;
201198
202199 ninja = super.ninja.override { buildDocs = false; };
203− darwin = super.darwin // { cctools = super.darwin.cctools.override { llvm = null; }; };
200+ darwin = super.darwin // {
201+ cctools = super.darwin.cctools.override {
202+ llvm = null;
203+ enableTapiSupport = false;
204+ };
205+ };
204206 };
205207 in with prevStage; stageFun 1 prevStage {
206208 extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
@@ -260,9 +262,9 @@ in rec {
260262 # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds.
261263 libxml2 = super.libxml2.override { pythonSupport = false; };
262264
263− llvmPackages_5 = super.llvmPackages_5 // (let
264− libraries = super.llvmPackages_5.libraries.extend (_: _: {
265− inherit (llvmPackages_5) libcxx libcxxabi;
265+ llvmPackages_7 = super.llvmPackages_7 // (let
266+ libraries = super.llvmPackages_7.libraries.extend (_: _: {
267+ inherit (llvmPackages_7) libcxx libcxxabi;
266268 });
267269 in { inherit libraries; } // libraries);
268270
@@ -278,8 +280,8 @@ in rec {
278280 # enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
279281 # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
280282 # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
281− extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
282− extraBuildInputs = [ pkgs.darwin.CF ];
283+ extraNativeBuildInputs = with pkgs; [ xz ];
284+ extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ];
283285 libcxx = pkgs.libcxx;
284286
285287 extraPreHook = ''
@@ -314,18 +316,20 @@ in rec {
314316 ];
315317 });
316318
317− llvmPackages_5 = super.llvmPackages_5 // (let
318− tools = super.llvmPackages_5.tools.extend (llvmSelf: _: {
319− inherit (llvmPackages_5) llvm clang-unwrapped;
319+ llvmPackages_7 = super.llvmPackages_7 // (let
320+ tools = super.llvmPackages_7.tools.extend (llvmSelf: _: {
321+ clang-unwrapped = llvmPackages_7.clang-unwrapped.override { llvm = llvmSelf.llvm; };
322+ llvm = llvmPackages_7.llvm.override { libxml2 = self.darwin.libxml2-nopython; };
320323 });
321− libraries = super.llvmPackages_5.libraries.extend (llvmSelf: _: {
322− inherit (llvmPackages_5) libcxx libcxxabi compiler-rt;
324+ libraries = super.llvmPackages_7.libraries.extend (llvmSelf: _: {
325+ inherit (llvmPackages_7) libcxx libcxxabi compiler-rt;
323326 });
324327 in { inherit tools libraries; } // tools // libraries);
325328
326329 darwin = super.darwin // rec {
327330 inherit (darwin) dyld Libsystem libiconv locale;
328331
332+ cctools = super.darwin.cctools.override { enableTapiSupport = false; };
329333 libxml2-nopython = super.libxml2.override { pythonSupport = false; };
330334 CF = super.darwin.CF.override {
331335 libxml2 = libxml2-nopython;
@@ -335,8 +339,8 @@ in rec {
335339 };
336340 in with prevStage; stageFun 4 prevStage {
337341 shell = "${pkgs.bash}/bin/bash";
338− extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
339− extraBuildInputs = [ pkgs.darwin.CF ];
342+ extraNativeBuildInputs = with pkgs; [ xz ];
343+ extraBuildInputs = [ pkgs.darwin.CF pkgs.bash ];
340344 libcxx = pkgs.libcxx;
341345
342346 extraPreHook = ''
@@ -353,12 +357,12 @@ in rec {
353357 ncurses libffi zlib llvm gmp pcre gnugrep
354358 coreutils findutils diffutils patchutils;
355359
356− llvmPackages_5 = super.llvmPackages_5 // (let
357− tools = super.llvmPackages_5.tools.extend (_: super: {
358− inherit (llvmPackages_5) llvm clang-unwrapped;
360+ llvmPackages_7 = super.llvmPackages_7 // (let
361+ tools = super.llvmPackages_7.tools.extend (_: super: {
362+ inherit (llvmPackages_7) llvm clang-unwrapped;
359363 });
360− libraries = super.llvmPackages_5.libraries.extend (_: _: {
361− inherit (llvmPackages_5) compiler-rt libcxx libcxxabi;
364+ libraries = super.llvmPackages_7.libraries.extend (_: _: {
365+ inherit (llvmPackages_7) compiler-rt libcxx libcxxabi;
362366 });
363367 in { inherit tools libraries; } // tools // libraries);
364368
@@ -414,9 +418,6 @@ in rec {
414418 inherit platform bootstrapTools;
415419 libc = pkgs.darwin.Libsystem;
416420 shellPackage = pkgs.bash;
417−
418− # This is used all over the place so I figured I'd just leave it here for now
419− secure-format-patch = ./darwin-secure-format.patch;
420421 };
421422
422423 allowedRequisites = (with pkgs; [
pkgs/stdenv/darwin/make-bootstrap-tools.nix+4−4
@@ -3,7 +3,7 @@
33with import pkgspath { inherit system; };
44
55let
6− llvmPackages = llvmPackages_5;
6+ llvmPackages = llvmPackages_7;
77in rec {
88 coreutils_ = coreutils.override (args: {
99 # We want coreutils without ACL support.
@@ -80,14 +80,14 @@ in rec {
8080 cp -d ${libxml2.out}/lib/libxml2*.dylib $out/lib
8181
8282 # Copy what we need of clang
83− cp -d ${llvmPackages.clang-unwrapped}/bin/clang $out/bin
84− cp -d ${llvmPackages.clang-unwrapped}/bin/clang++ $out/bin
85− cp -d ${llvmPackages.clang-unwrapped}/bin/clang-[0-9].[0-9] $out/bin
83+ cp -d ${llvmPackages.clang-unwrapped}/bin/clang* $out/bin
8684
8785 cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib
8886
8987 cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib
9088 cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib
89+ cp -d ${llvmPackages.llvm.lib}/lib/libLLVM.dylib $out/lib
90+ cp -d ${libffi}/lib/libffi*.dylib $out/lib
9191
9292 mkdir $out/include
9393 cp -rd ${llvmPackages.libcxx}/include/c++ $out/include
pkgs/stdenv/generic/setup.sh+7−4
@@ -182,10 +182,8 @@ addToSearchPathWithCustomDelimiter() {
182182 fi
183183}
184184
185−PATH_DELIMITER=':'
186−
187185addToSearchPath() {
188− addToSearchPathWithCustomDelimiter "${PATH_DELIMITER}" "$@"
186+ addToSearchPathWithCustomDelimiter ":" "$@"
189187}
190188
191189# Add $1/lib* into rpaths.
@@ -508,7 +506,7 @@ activatePackage() {
508506 fi
509507
510508 if [[ "$hostOffset" -eq 0 && -d "$pkg/bin" ]]; then
511− addToSearchPath HOST_PATH "$pkg/bin"
509+ addToSearchPath _HOST_PATH "$pkg/bin"
512510 fi
513511
514512 if [[ -f "$pkg/nix-support/setup-hook" ]]; then
@@ -617,10 +615,15 @@ fi
617615
618616
619617PATH="${_PATH-}${_PATH:+${PATH:+:}}$PATH"
618+HOST_PATH="${_HOST_PATH-}${_HOST_PATH:+${HOST_PATH:+:}}$HOST_PATH"
620619if (( "${NIX_DEBUG:-0}" >= 1 )); then
621620 echo "final path: $PATH"
621+ echo "final host path: $HOST_PATH"
622622fi
623623
624+unset _PATH
625+unset _HOST_PATH
626+
624627
625628# Make GNU Make produce nested output.
626629export NIX_INDENT_MAKE=1
pkgs/tools/X11/xprintidle-ng/default.nix+19−9
@@ -2,23 +2,28 @@
22 , autoconf, automake, libtool, gettext, pkgconfig
33 , git, perl, texinfo, help2man
44}:
5+
56stdenv.mkDerivation rec {
7+ pname = "xprintidle-ng";
68 version = "git-2015-09-01";
7− name = "${baseName}-${version}";
8− baseName = "xprintidle-ng";
99
10− buildInputs = [
11− libX11 libXScrnSaver libXext gnulib
12− autoconf automake libtool gettext pkgconfig git perl
13− texinfo help2man
14− ];
1510 src = fetchFromGitHub {
1611 owner = "taktoa";
17− repo = "${baseName}";
12+ repo = pname;
1813 rev = "9083ba284d9222541ce7da8dc87d5a27ef5cc592";
1914 sha256 = "0a5024vimpfrpj6w60j1ad8qvjkrmxiy8w1yijxfwk917ag9rkpq";
2015 };
2116
17+ postPatch = ''
18+ substituteInPlace configure.ac \
19+ --replace "AC_PREREQ([2.62])" "AC_PREREQ([2.63])"
20+ '';
21+
22+ nativeBuildInputs = [
23+ autoconf automake gettext git gnulib
24+ help2man libtool perl pkgconfig texinfo
25+ ];
26+
2227 configurePhase = ''
2328 cp -r "${gnulib}" gnulib
2429 chmod a+rX,u+w -R gnulib
@@ -26,10 +31,15 @@ stdenv.mkDerivation rec {
2631 ./configure --prefix="$out"
2732 '';
2833
34+ buildInputs = [
35+ libX11 libXScrnSaver libXext
36+ ];
37+
2938 meta = {
3039 inherit version;
3140 description = ''A command-line tool to print idle time from libXss'';
32− license = stdenv.lib.licenses.gpl2 ;
41+ homepage = http://taktoa.me/xprintidle-ng/;
42+ license = stdenv.lib.licenses.gpl2;
3343 maintainers = [stdenv.lib.maintainers.raskin];
3444 platforms = stdenv.lib.platforms.linux;
3545 };
pkgs/tools/archivers/gnutar/default.nix+1
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
1313 configureFlags = stdenv.lib.optionals stdenv.isDarwin [
1414 "gt_cv_func_CFPreferencesCopyAppValue=no"
1515 "gt_cv_func_CFLocaleCopyCurrent=no"
16+ "gt_cv_func_CFLocaleCopyPreferredLanguages=no"
1617 ];
1718
1819 # gnutar tries to call into gettext between `fork` and `exec`,
pkgs/tools/archivers/p7zip/default.nix+2
@@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
3737
3838 setupHook = ./setup-hook.sh;
3939
40+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing";
41+
4042 meta = {
4143 homepage = http://p7zip.sourceforge.net/;
4244 description = "A port of the 7-zip archiver";
pkgs/tools/compression/lz4/default.nix+2−2
@@ -4,10 +4,10 @@
44
55stdenv.mkDerivation rec {
66 name = "lz4-${version}";
7− version = "1.8.3";
7+ version = "1.9.1";
88
99 src = fetchFromGitHub {
10− sha256 = "0lq00yi7alr9aip6dw0flykzi8yv7z43aay177n86spn9qms7s3g";
10+ sha256 = "1l1caxrik1hqs40vj3bpv1pikw6b74cfazv5c0v6g48zpcbmshl0";
1111 rev = "v${version}";
1212 repo = "lz4";
1313 owner = "lz4";
pkgs/tools/compression/pbzip2/default.nix+2
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
1717
1818 installFlags = "PREFIX=$(out)";
1919
20+ NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal";
21+
2022 meta = with stdenv.lib; {
2123 homepage = http://compression.ca/pbzip2/;
2224 description = "A parallel implementation of bzip2 for multi-core machines";
pkgs/tools/filesystems/e2fsprogs/default.nix+3−1
@@ -39,7 +39,9 @@ stdenv.mkDerivation rec {
3939
4040 postInstall = ''
4141 # avoid cycle between outputs
42− mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
42+ if [ -f $out/lib/${pname}/e2scrub_all_cron ]; then
43+ mv $out/lib/${pname}/e2scrub_all_cron $bin/bin/
44+ fi
4345 '';
4446
4547 enableParallelBuilding = true;
pkgs/tools/filesystems/file-rename/default.nix+2
@@ -15,6 +15,8 @@ perlPackages.buildPerlPackage rec {
1515 --prefix PERL5LIB : $out/${perlPackages.perl.libPrefix}
1616 '';
1717
18+ doCheck = !stdenv.isDarwin;
19+
1820 meta = with stdenv.lib; {
1921 description = "Perl extension for renaming multiple files";
2022 license = licenses.artistic1;
pkgs/tools/misc/toybox/default.nix+2
@@ -54,6 +54,8 @@ stdenv.mkDerivation rec {
5454 checkInputs = [ which ]; # used for tests with checkFlags = [ "DEBUG=true" ];
5555 checkTarget = "tests";
5656
57+ NIX_CFLAGS_COMPILE = "-Wno-error";
58+
5759 meta = with stdenv.lib; {
5860 description = "Lightweight implementation of some Unix command line utilities";
5961 homepage = https://landley.net/toybox/;
pkgs/tools/misc/zabbix-cli/default.nix+2−2
@@ -4,7 +4,7 @@ let
44
55in pythonPackages.buildPythonApplication rec {
66 name = "zabbix-cli-${version}";
7− version = "1.7.0";
7+ version = "2.0.1";
88
99 propagatedBuildInputs = with pythonPackages; [ ipaddr requests ];
1010
@@ -17,7 +17,7 @@ in pythonPackages.buildPythonApplication rec {
1717 owner = "usit-gd";
1818 repo = "zabbix-cli";
1919 rev = version;
20− sha256 = "0z33mv8xk0h72rn0iz1qrrkyz63w6cln8d5hqqddcvkxwnq0z6kx";
20+ sha256 = "0kwrfgq6h26dajll11f21c8b799bsfl1axmk2fdghl1gclxra7ry";
2121 };
2222
2323 meta = with lib; {
pkgs/tools/networking/network-manager/default.nix+9−5
@@ -2,7 +2,7 @@
22, gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala
33, libgcrypt, dnsmasq, bluez5, readline, libselinux, audit
44, gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup
5−, ethtool, gnused, coreutils, inetutils, kmod, jansson, gtk-doc, libxslt
5+, ethtool, gnused, coreutils, iputils, kmod, jansson, gtk-doc, libxslt
66, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43
77, openconnect, curl, meson, ninja, libpsl, libredirect }:
88
@@ -11,11 +11,11 @@ let
1111 pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]);
1212in stdenv.mkDerivation rec {
1313 name = "network-manager-${version}";
14− version = "1.16.0";
14+ version = "1.18.0";
1515
1616 src = fetchurl {
1717 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
18− sha256 = "0b2x9hrg41cd17psqi0vacwj733v99hxczn53gdfs0yanqrji5lf";
18+ sha256 = "19lb5afx4iq8dgfsy26x9j4194v8f64vwr3nq6dk1ix3wljxzs66";
1919 };
2020
2121 outputs = [ "out" "dev" "devdoc" "man" "doc" ];
@@ -43,15 +43,18 @@ in stdenv.mkDerivation rec {
4343 "-Dmodem_manager=true"
4444 "-Dnmtui=true"
4545 "-Ddocs=true"
46− "-Dlibnm_glib=true" # legacy library, TODO: remove
46+ # TODO: legacy library, will be *removed* in next release!
47+ "-Dlibnm_glib=true"
4748 "-Dtests=no"
4849 "-Dqt=false"
50+ # Allow using iwd when configured to do so
51+ "-Diwd=true"
4952 ];
5053
5154 patches = [
5255 (substituteAll {
5356 src = ./fix-paths.patch;
54− inherit inetutils kmod openconnect ethtool coreutils dbus;
57+ inherit iputils kmod openconnect ethtool coreutils dbus;
5558 inherit (stdenv) shell;
5659 })
5760
@@ -84,6 +87,7 @@ in stdenv.mkDerivation rec {
8487
8588 doCheck = false; # requires /sys, the net
8689
90+
8791 postPatch = ''
8892 patchShebangs ./tools
8993 patchShebangs libnm/generate-setting-docs.py
pkgs/tools/networking/network-manager/fix-paths.patch+6−5
@@ -35,12 +35,12 @@
3535 Restart=on-failure
3636--- a/src/devices/nm-device.c
3737+++ b/src/devices/nm-device.c
38−@@ -12350,14 +12350,14 @@
38+@@ -12451,14 +12451,14 @@ nm_device_start_ip_check (NMDevice *self)
3939 gw = nm_ip4_config_best_default_route_get (priv->ip_config_4);
4040 if (gw) {
4141 nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf);
4242- ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL);
43−+ ping_binary = "@inetutils@/bin/ping";
43++ ping_binary = "@iputils@/bin/ping";
4444 log_domain = LOGD_IP4;
4545 }
4646 } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) {
@@ -48,13 +48,15 @@
4848 if (gw) {
4949 nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf);
5050- ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL);
51−+ ping_binary = "@inetutils@/bin/ping";
51++ ping_binary = "@iputils@/bin/ping";
5252 log_domain = LOGD_IP6;
5353 }
5454 }
55+diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
56+index 6f55e62a7..93721e7fb 100644
5557--- a/src/nm-core-utils.c
5658+++ b/src/nm-core-utils.c
57−@@ -421,8 +421,8 @@
59+@@ -442,7 +442,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char *
5860
5961 /* construct the argument list */
6062 argv = g_ptr_array_sized_new (4);
@@ -63,4 +65,3 @@
6365 g_ptr_array_add (argv, "--use-blacklist");
6466 g_ptr_array_add (argv, (char *) arg1);
6567
66− va_start (ap, arg1);
pkgs/tools/networking/ntopng/default.nix+2−1
@@ -53,7 +53,8 @@ stdenv.mkDerivation rec {
5353 sed 's|LIBS += -lstdc++.6||' -i Makefile
5454 '';
5555
56− NIX_CFLAGS_COMPILE = [ "-fpermissive" ];
56+ NIX_CFLAGS_COMPILE = [ "-fpermissive" ]
57+ ++ stdenv.lib.optional stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal";
5758
5859 meta = with stdenv.lib; {
5960 description = "High-speed web-based traffic analysis and flow collection tool";
pkgs/tools/package-management/nix/default.nix+5−2
@@ -3,6 +3,7 @@
33, stateDir ? "/nix/var"
44, confDir ? "/etc"
55, boehmgc
6+, stdenv, llvmPackages_6
67}:
78
89let
@@ -166,7 +167,7 @@ in rec {
166167 inherit storeDir stateDir confDir boehmgc;
167168 };
168169
169− nixStable = callPackage common rec {
170+ nixStable = callPackage common (rec {
170171 name = "nix-2.2.2";
171172 src = fetchurl {
172173 url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
@@ -174,7 +175,9 @@ in rec {
174175 };
175176
176177 inherit storeDir stateDir confDir boehmgc;
177− };
178+ } // stdenv.lib.optionalAttrs stdenv.cc.isClang {
179+ stdenv = llvmPackages_6.stdenv;
180+ });
178181
179182 nixUnstable = lib.lowPrio (callPackage common rec {
180183 name = "nix-2.3${suffix}";
pkgs/tools/security/opensc/default.nix+2
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
2121 libXt libxslt libiconv docbook_xml_dtd_412
2222 ] ++ stdenv.lib.optional stdenv.isDarwin Carbon;
2323
24+ NIX_CFLAGS_COMPILE = "-Wno-error";
25+
2426 configureFlags = [
2527 "--enable-zlib"
2628 "--enable-readline"
pkgs/tools/security/tcpcrypt/default.nix+3−3
@@ -1,5 +1,5 @@
11{ stdenv, fetchFromGitHub, autoreconfHook
2−, openssl
2+, openssl, lib
33, libcap, libpcap, libnfnetlink, libnetfilter_conntrack, libnetfilter_queue
44}:
55
@@ -20,8 +20,8 @@ stdenv.mkDerivation rec {
2020
2121 outputs = [ "bin" "dev" "out" ];
2222 nativeBuildInputs = [ autoreconfHook ];
23− buildInputs = [ openssl ]
24− ++ optionals stdenv.isLinux [ libcap libpcap libnfnetlink libnetfilter_conntrack libnetfilter_queue ];
23+ buildInputs = [ openssl libpcap ]
24+ ++ optionals stdenv.isLinux [ libcap libnfnetlink libnetfilter_conntrack libnetfilter_queue ];
2525
2626 enableParallelBuilding = true;
2727
pkgs/tools/text/gnupatch/CVE-2018-6952.patchnew file+28
@@ -0,0 +1,28 @@
1+From 9c986353e420ead6e706262bf204d6e03322c300 Mon Sep 17 00:00:00 2001
2+From: Andreas Gruenbacher <agruen@gnu.org>
3+Date: Fri, 17 Aug 2018 13:35:40 +0200
4+Subject: Fix swapping fake lines in pch_swap
5+
6+* src/pch.c (pch_swap): Fix swapping p_bfake and p_efake when there is a
7+blank line in the middle of a context-diff hunk: that empty line stays
8+in the middle of the hunk and isn't swapped.
9+
10+Fixes: https://savannah.gnu.org/bugs/index.php?53133
11+---
12+ src/pch.c | 2 +-
13+ 1 file changed, 1 insertion(+), 1 deletion(-)
14+
15+diff --git a/src/pch.c b/src/pch.c
16+index e92bc64..a500ad9 100644
17+--- a/src/pch.c
18++++ b/src/pch.c
19+@@ -2122,7 +2122,7 @@ pch_swap (void)
20+ }
21+ if (p_efake >= 0) { /* fix non-freeable ptr range */
22+ if (p_efake <= i)
23+- n = p_end - i + 1;
24++ n = p_end - p_ptrn_lines;
25+ else
26+ n = -i;
27+ p_efake += n;
28+--
pkgs/tools/text/gnupatch/default.nix+2
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
2121 url = https://sources.debian.org/data/main/p/patch/2.7.6-2/debian/patches/Fix_arbitrary_command_execution_in_ed-style_patches.patch;
2222 sha256 = "1bpy16n3hm5nv9xkrn6c4wglzsdzj3ss1biq16w9kfv48p4hx2vg";
2323 })
24+ # https://git.savannah.gnu.org/cgit/patch.git/commit/?id=9c986353e420ead6e706262bf204d6e03322c300
25+ ./CVE-2018-6952.patch
2426 ];
2527
2628 nativeBuildInputs = [ autoreconfHook ];
pkgs/tools/text/platinum-searcher/default.nix−5
@@ -16,11 +16,6 @@ buildGoPackage rec {
1616
1717 goDeps = ./deps.nix;
1818
19− preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
20− # fixes cycle between $out and $bin
21− install_name_tool -delete_rpath $out/lib $bin/bin/pt
22− '';
23−
2419 meta = with stdenv.lib; {
2520 homepage = https://github.com/monochromegane/the_platinum_searcher;
2621 description = "A code search tool similar to ack and the_silver_searcher(ag).";
pkgs/tools/text/sgml/opensp/default.nix+12−8
@@ -1,4 +1,5 @@
1−{ lib, stdenv, fetchurl, xmlto, docbook_xml_dtd_412, libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}:
1+{ lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412
2+, libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool}:
23
34stdenv.mkDerivation {
45 name = "opensp-1.5.2";
@@ -8,16 +9,18 @@ stdenv.mkDerivation {
89 sha256 = "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p";
910 };
1011
11− patchPhase = ''
12+ postPatch = ''
1213 sed -i s,/usr/share/sgml/docbook/xml-dtd-4.1.2/,${docbook_xml_dtd_412}/xml/dtd/docbook/, \
1314 docsrc/*.xml
1415 '';
1516
16− configureFlags = lib.optional stdenv.isDarwin [
17− "--with-libintl-prefix=/usr"
18− "--with-libiconv-prefix=/usr"
17+ patches = [
18+ (fetchpatch {
19+ url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/opensp/files/opensp-1.5.2-c11-using.patch?id=688d9675782dfc162d4e6cff04c668f7516118d0";
20+ sha256 = "04q14s8qsad0bkjmj067dn831i0r6v7742rafdlnbfm5y249m2q6";
21+ })
1922 ];
20−
23+
2124 setupHook = ./setup-hook.sh;
2225
2326 postFixup = ''
@@ -29,8 +32,9 @@ stdenv.mkDerivation {
2932 preConfigure = if stdenv.isCygwin then "autoreconf -fi" else null;
3033
3134 # need autoconf, automake, gettext, and libtool for reconfigure
32− buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake gettext libiconv libtool ]
33− ++ [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ];
35+ nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
36+
37+ buildInputs = [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl gettext libiconv ];
3438
3539 doCheck = false; # fails
3640
pkgs/top-level/all-packages.nix+71−28
@@ -1302,6 +1302,7 @@ in
13021302 contacts = callPackage ../tools/misc/contacts {
13031303 inherit (darwin) cf-private;
13041304 inherit (darwin.apple_sdk.frameworks) Foundation AddressBook;
1305+ xcbuildHook = xcbuild6Hook;
13051306 };
13061307
13071308 compsize = callPackage ../os-specific/linux/compsize { };
@@ -3413,7 +3414,9 @@ in
34133414 hdf4 = null;
34143415 };
34153416
3416− haproxy = callPackage ../tools/networking/haproxy { };
3417+ haproxy = callPackage ../tools/networking/haproxy {
3418+ stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
3419+ };
34173420
34183421 haveged = callPackage ../tools/security/haveged { };
34193422
@@ -4108,6 +4111,13 @@ in
41084111 enableNpm = false;
41094112 openssl = openssl_1_1;
41104113 };
4114+ nodejs-12_x = callPackage ../development/web/nodejs/v12.nix {
4115+ openssl = openssl_1_1;
4116+ };
4117+ nodejs-slim-12_x = callPackage ../development/web/nodejs/v12.nix {
4118+ enableNpm = false;
4119+ openssl = openssl_1_1;
4120+ };
41114121
41124122 nodePackages_10_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v10.nix {
41134123 nodejs = pkgs.nodejs-10_x;
@@ -4507,7 +4517,9 @@ in
45074517 docbook-xsl = docbook_xsl;
45084518 };
45094519
4510− mosh = callPackage ../tools/networking/mosh { };
4520+ mosh = callPackage ../tools/networking/mosh {
4521+ stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
4522+ };
45114523
45124524 motuclient = callPackage ../applications/science/misc/motu-client { };
45134525
@@ -5124,6 +5136,7 @@ in
51245136 pinentry_mac = callPackage ../tools/security/pinentry/mac.nix {
51255137 inherit (darwin) cf-private;
51265138 inherit (darwin.apple_sdk.frameworks) Cocoa;
5139+ xcbuildHook = xcbuild6Hook;
51275140 };
51285141
51295142 pingtcp = callPackage ../tools/networking/pingtcp { };
@@ -5297,7 +5310,9 @@ in
52975310
52985311 remarshal = callPackage ../development/tools/remarshal { };
52995312
5300− rig = callPackage ../tools/misc/rig { };
5313+ rig = callPackage ../tools/misc/rig {
5314+ stdenv = gccStdenv;
5315+ };
53015316
53025317 rocket = libsForQt5.callPackage ../tools/graphics/rocket { };
53035318
@@ -5818,7 +5833,7 @@ in
58185833
58195834 fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; };
58205835
5821− sl = callPackage ../tools/misc/sl { };
5836+ sl = callPackage ../tools/misc/sl { stdenv = gccStdenv; };
58225837
58235838 socat = callPackage ../tools/networking/socat { };
58245839
@@ -6950,7 +6965,9 @@ in
69506965 inherit (buildPackages.darwin) bootstrap_cmds;
69516966 };
69526967
6953− cdb = callPackage ../development/tools/database/cdb { };
6968+ cdb = callPackage ../development/tools/database/cdb {
6969+ stdenv = gccStdenv;
6970+ };
69546971
69556972 chez = callPackage ../development/compilers/chez {
69566973 inherit (darwin) cctools;
@@ -6963,11 +6980,6 @@ in
69636980 name = "clang-wrapper-with-reexport-hack";
69646981 bintools = darwin.binutils.override {
69656982 useMacosReexportHack = true;
6966− bintools = darwin.binutils.bintools.override {
6967− cctools = darwin.cctools.override {
6968− enableDumpNormalizedLibArgs = true;
6969− };
6970− };
69716983 };
69726984 };
69736985 llvm-polly = llvmPackages_latest.llvm-polly;
@@ -7013,7 +7025,10 @@ in
70137025
70147026 cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol;
70157027
7016− inherit (callPackages ../development/compilers/crystal {})
7028+ inherit (callPackages ../development/compilers/crystal {
7029+ stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
7030+ inherit (llvmPackages_6) clang llvm;
7031+ })
70177032 crystal_0_25
70187033 crystal_0_26
70197034 crystal;
@@ -7627,7 +7642,7 @@ in
76277642 llvm_37 = llvmPackages_37.llvm;
76287643 llvm_35 = llvmPackages_35.llvm;
76297644
7630− llvmPackages = recurseIntoAttrs llvmPackages_5;
7645+ llvmPackages = recurseIntoAttrs llvmPackages_7;
76317646
76327647 llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({
76337648 isl = isl_0_14;
@@ -7944,7 +7959,9 @@ in
79447959
79457960 tinycc = callPackage ../development/compilers/tinycc { };
79467961
7947− tinyscheme = callPackage ../development/interpreters/tinyscheme { };
7962+ tinyscheme = callPackage ../development/interpreters/tinyscheme {
7963+ stdenv = gccStdenv;
7964+ };
79487965
79497966 inherit (ocaml-ng.ocamlPackages_4_02) trv;
79507967
@@ -8169,7 +8186,9 @@ in
81698186
81708187 lush2 = callPackage ../development/interpreters/lush {};
81718188
8172− maude = callPackage ../development/interpreters/maude { };
8189+ maude = callPackage ../development/interpreters/maude {
8190+ stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
8191+ };
81738192
81748193 me_cleaner = pythonPackages.callPackage ../tools/misc/me_cleaner { };
81758194
@@ -8248,11 +8267,13 @@ in
82488267 php = php72-unit;
82498268 });
82508269
8251− php73Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
8270+ php73Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix {
82528271 php = php73-unit;
82538272 });
82548273
8255− inherit (callPackages ../development/interpreters/php { })
8274+ inherit (callPackages ../development/interpreters/php {
8275+ stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
8276+ })
82568277 php71
82578278 php72
82588279 php73;
@@ -8830,9 +8851,7 @@ in
88308851
88318852 cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { };
88328853
8833− cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake {
8834− inherit (darwin) cf-private;
8835− };
8854+ cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { };
88368855
88378856 cmakeCurses = cmake.override { useNcurses = true; };
88388857
@@ -8861,9 +8880,11 @@ in
88618880 cpplint = callPackage ../development/tools/analysis/cpplint { };
88628881
88638882 cquery = callPackage ../development/tools/misc/cquery {
8864− llvmPackages = llvmPackages_latest;
8883+ # 7 is the default, but only on Linux, so keep this for now
8884+ llvmPackages = llvmPackages_7;
88658885 };
88668886
8887+
88678888 ccls = callPackage ../development/tools/misc/ccls {
88688889 llvmPackages = llvmPackages_7;
88698890 stdenv = llvmPackages_7.stdenv;
@@ -9602,11 +9623,17 @@ in
96029623 xcodebuild = callPackage ../development/tools/xcbuild/wrapper.nix {
96039624 inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO;
96049625 };
9626+ xcodebuild6 = xcodebuild.override { stdenv = llvmPackages_6.stdenv; };
96059627 xcbuild = xcodebuild;
96069628 xcbuildHook = makeSetupHook {
96079629 deps = [ xcbuild ];
96089630 } ../development/tools/xcbuild/setup-hook.sh ;
96099631
9632+ # xcbuild with llvm 6
9633+ xcbuild6Hook = makeSetupHook {
9634+ deps = [ xcodebuild6 ];
9635+ } ../development/tools/xcbuild/setup-hook.sh ;
9636+
96109637 xcpretty = callPackage ../development/tools/xcpretty { };
96119638
96129639 xmlindent = callPackage ../development/web/xmlindent {};
@@ -9882,9 +9909,13 @@ in
98829909
98839910 cln = callPackage ../development/libraries/cln { };
98849911
9885− clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix { };
9912+ clucene_core_2 = callPackage ../development/libraries/clucene-core/2.x.nix {
9913+ stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
9914+ };
98869915
9887− clucene_core_1 = callPackage ../development/libraries/clucene-core { };
9916+ clucene_core_1 = callPackage ../development/libraries/clucene-core {
9917+ stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
9918+ };
98889919
98899920 clucene_core = clucene_core_1;
98909921
@@ -10934,7 +10965,7 @@ in
1093410965
1093510966 libao = callPackage ../development/libraries/libao {
1093610967 usePulseAudio = config.pulseaudio or stdenv.isLinux;
10937− inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit;
10968+ inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit AudioToolbox;
1093810969 };
1093910970
1094010971 libaosd = callPackage ../development/libraries/libaosd { };
@@ -11010,7 +11041,7 @@ in
1101011041 inherit (darwin.apple_sdk.frameworks) CoreServices;
1101111042 };
1101211043 libcanberra-gtk3 = pkgs.libcanberra.override {
11013− gtk = gtk3;
11044+ gtk = gtk3.override { x11Support = true; };
1101411045 };
1101511046 libcanberra-gtk2 = pkgs.libcanberra-gtk3.override {
1101611047 gtk = gtk2.override { gdktarget = "x11"; };
@@ -12040,6 +12071,7 @@ in
1204012071 libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms;
1204112072
1204212073 mesa_noglu = callPackage ../development/libraries/mesa {
12074+ # 7 is the default, but only on Linux, so keep this for now
1204312075 llvmPackages = llvmPackages_7;
1204412076 inherit (darwin.apple_sdk.frameworks) OpenGL;
1204512077 inherit (darwin.apple_sdk.libs) Xplugin;
@@ -12563,6 +12595,7 @@ in
1256312595 inherit gtk3;
1256412596 inherit (gnome3) dconf;
1256512597 inherit (gst_all_1) gstreamer gst-plugins-base;
12598+ inherit llvmPackages_5;
1256612599 });
1256712600
1256812601 libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5);
@@ -12580,6 +12613,7 @@ in
1258012613 inherit gtk3;
1258112614 inherit (gnome3) dconf;
1258212615 inherit (gst_all_1) gstreamer gst-plugins-base;
12616+ inherit llvmPackages_5;
1258312617 });
1258412618
1258512619 libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5);
@@ -19160,7 +19194,9 @@ in
1916019194
1916119195 openbox = callPackage ../applications/window-managers/openbox { };
1916219196
19163− openbox-menu = callPackage ../applications/misc/openbox-menu { };
19197+ openbox-menu = callPackage ../applications/misc/openbox-menu {
19198+ stdenv = gccStdenv;
19199+ };
1916419200
1916519201 openbrf = libsForQt5.callPackage ../applications/misc/openbrf { };
1916619202
@@ -21763,7 +21799,9 @@ in
2176321799
2176421800 xtris = callPackage ../games/xtris { };
2176521801
21766− inherit (callPackage ../games/quake2/yquake2 { })
21802+ inherit (callPackage ../games/quake2/yquake2 {
21803+ inherit (darwin.apple_sdk.frameworks) Cocoa OpenAL;
21804+ })
2176721805 yquake2
2176821806 yquake2-ctf
2176921807 yquake2-ground-zero
@@ -22673,11 +22711,13 @@ in
2267322711 root = callPackage ../applications/science/misc/root {
2267422712 inherit (darwin) cf-private;
2267522713 inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
22714+ stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
2267622715 };
2267722716
2267822717 root5 = lowPrio (callPackage ../applications/science/misc/root/5.nix {
2267922718 inherit (darwin) cf-private;
2268022719 inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL;
22720+ stdenv = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
2268122721 });
2268222722
2268322723 rink = callPackage ../applications/science/misc/rink { };
@@ -22998,7 +23038,8 @@ in
2299823038
2299923039 jack2 = callPackage ../misc/jackaudio {
2300023040 libopus = libopus.override { withCustomModes = true; };
23001− inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio CoreFoundation;
23041+ inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio Accelerate;
23042+ inherit (darwin) cf-private libobjc;
2300223043 };
2300323044 libjack2 = jack2.override { prefix = "lib"; };
2300423045 jack2Full = jack2; # TODO: move to aliases.nix
@@ -23323,7 +23364,9 @@ in
2332323364
2332423365 fsuae = callPackage ../misc/emulators/fs-uae { };
2332523366
23326− putty = callPackage ../applications/networking/remote/putty { };
23367+ putty = callPackage ../applications/networking/remote/putty {
23368+ gtk2 = gtk2-x11;
23369+ };
2332723370
2332823371 qMasterPassword = libsForQt5.callPackage ../applications/misc/qMasterPassword { };
2332923372
pkgs/top-level/darwin-packages.nix+5−9
@@ -15,7 +15,7 @@ in
1515 binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
1616 inherit (darwin) cctools;
1717 inherit (pkgs) binutils-unwrapped;
18− inherit (pkgs.llvmPackages_5) llvm;
18+ inherit (pkgs.llvmPackages_7) llvm;
1919 };
2020
2121 binutils = pkgs.wrapBintoolsWith {
@@ -27,13 +27,13 @@ in
2727 };
2828
2929 cctools = callPackage ../os-specific/darwin/cctools/port.nix {
30− inherit (darwin) libobjc maloader;
30+ inherit (darwin) libobjc maloader libtapi;
3131 stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
3232 libcxxabi = pkgs.libcxxabi;
3333 };
3434
3535 cf-private = callPackage ../os-specific/darwin/cf-private {
36− inherit (darwin) CF apple_sdk osx_private_sdk;
36+ inherit (darwin) CF apple_sdk;
3737 };
3838
3939 DarwinTools = callPackage ../os-specific/darwin/DarwinTools { };
@@ -59,12 +59,6 @@ in
5959
6060 opencflite = callPackage ../os-specific/darwin/opencflite { };
6161
62− osx_private_sdk = callPackage ../os-specific/darwin/osx-private-sdk { };
63−
64− security_tool = darwin.callPackage ../os-specific/darwin/security-tool {
65− Security-framework = darwin.apple_sdk.frameworks.Security;
66− };
67−
6862 stubs = callPackages ../os-specific/darwin/stubs { };
6963
7064 trash = darwin.callPackage ../os-specific/darwin/trash { };
@@ -83,4 +77,6 @@ in
8377
8478 darling = callPackage ../os-specific/darwin/darling/default.nix { };
8579
80+ libtapi = callPackage ../os-specific/darwin/libtapi {};
81+
8682})
pkgs/top-level/perl-packages.nix+3
@@ -6715,6 +6715,7 @@ let
67156715 sha256 = "1044rj3wbfmgaif2jb0k28m2aczli6ai2n5yvn6pr7zjyw16kvd2";
67166716 };
67176717 buildInputs = [ pkgs.gtk2 Cairo ExtUtilsDepends ExtUtilsPkgConfig Glib Pango ];
6718+ doCheck = !stdenv.isDarwin;
67186719 meta = {
67196720 homepage = http://gtk2-perl.sourceforge.net/;
67206721 description = "Perl interface to the 2.x series of the Gimp Toolkit library";
@@ -14579,6 +14580,7 @@ let
1457914580 url = "mirror://cpan/authors/id/D/DW/DWHEELER/${name}.tar.gz";
1458014581 sha256 = "1655337l1cyd7q62007wrk87q2gbbwfq9xjy1wgx3hyflxpkkvl4";
1458114582 };
14583+ doCheck = !stdenv.isDarwin;
1458214584 meta = {
1458314585 description = "Stream TAP from pgTAP test scripts";
1458414586 license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
@@ -14736,6 +14738,7 @@ let
1473614738 sha256 = "1msxg3j1hx5wsc7vr81x5gs9gdbn4y0x6cvyj3pq4dgi1603dbvi";
1473714739 };
1473814740 propagatedBuildInputs = [ AppConfig ];
14741+ doCheck = !stdenv.isDarwin;
1473914742 meta = {
1474014743 description = "Comprehensive template processing system";
1474114744 license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
pkgs/top-level/python-packages.nix+2
@@ -1405,6 +1405,8 @@ in {
14051405
14061406 cfgv = callPackage ../development/python-modules/cfgv { };
14071407
1408+ cfn-lint = callPackage ../development/python-modules/cfn-lint { };
1409+
14081410 cftime = callPackage ../development/python-modules/cftime {};
14091411
14101412 cjson = callPackage ../development/python-modules/cjson { };
pkgs/top-level/release.nix−1
@@ -199,7 +199,6 @@ let
199199
200200 darwin = packagePlatforms pkgs.darwin // {
201201 cf-private = {};
202− osx_private_sdk = {};
203202 xcode = {};
204203 };
205204 } ));