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

Configure Feed

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

Merge branch 'staging' (early part)

The comparison looks nice on Hydra.

+202 -85
+25 -3
pkgs/development/compilers/llvm/4/clang/default.nix
··· 1 - { stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python }: 1 + { stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python 2 + , fixDarwinDylibNames 3 + }: 2 4 3 5 let 4 6 gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; ··· 15 13 mv clang-tools-extra-* $sourceRoot/tools/extra 16 14 ''; 17 15 18 - buildInputs = [ cmake libedit libxml2 llvm python ]; 16 + nativeBuildInputs = [ cmake python python.pkgs.sphinx ]; 17 + buildInputs = [ libedit libxml2 llvm ] 18 + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; 19 19 20 20 cmakeFlags = [ 21 21 "-DCMAKE_CXX_FLAGS=-std=c++11" 22 + "-DCLANG_INCLUDE_DOCS=ON" 23 + "-DLLVM_ENABLE_SPHINX=ON" 24 + "-DSPHINX_OUTPUT_MAN=ON" 25 + "-DSPHINX_OUTPUT_HTML=OFF" 26 + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" 22 27 ] ++ 23 28 # Maybe with compiler-rt this won't be needed? 24 29 (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++ ··· 33 24 34 25 patches = [ ./purity.patch ]; 35 26 27 + postBuild = '' 28 + cmake --build . --target docs-clang-man 29 + ''; 30 + 36 31 postPatch = '' 37 32 sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp 38 33 sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/ToolChains.cpp 34 + 35 + # Patch for standalone doc building 36 + sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt 39 37 ''; 40 38 41 - outputs = [ "out" "python" ]; 39 + outputs = [ "out" "man" "python" ]; 42 40 43 41 # Clang expects to find LLVMgold in its own prefix 44 42 # Clang expects to find sanitizer libraries in its own prefix ··· 62 46 mv $out/share/clang/*.py $python/share/clang 63 47 64 48 rm $out/bin/c-index-test 49 + 50 + # Manually install clang manpage 51 + cp docs/man/*.1 $out/share/man/man1/ 52 + 53 + # Move it and other man pages to 'man' output 54 + moveToOutput "share/man" "$man" 65 55 ''; 66 56 67 57 enableParallelBuilding = true;
+2 -1
pkgs/development/compilers/llvm/4/libc++abi.nix
··· 5 5 6 6 src = fetch "libcxxabi" "1n416kv27anabg9jsw6331r28ic30xk46p381lx2vbb2jrhwpafw"; 7 7 8 - buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; 8 + nativeBuildInputs = [ cmake ]; 9 + buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; 9 10 10 11 postUnpack = '' 11 12 unpackFile ${libcxx.src}
+2 -1
pkgs/development/compilers/llvm/4/lld.nix
··· 12 12 13 13 src = fetch "lld" "00km1qawk146pyjqa6aphcdzgkzrmg6cgk0ikg4661ffp5bn9q1k"; 14 14 15 - buildInputs = [ cmake llvm ]; 15 + nativeBuildInputs = [ cmake ]; 16 + buildInputs = [ llvm ]; 16 17 17 18 outputs = [ "out" "dev" ]; 18 19
+2 -1
pkgs/development/compilers/llvm/4/lldb.nix
··· 30 30 cmake/modules/LLDBStandalone.cmake 31 31 ''; 32 32 33 - buildInputs = [ cmake python which swig ncurses zlib libedit libxml2 llvm ] 33 + nativeBuildInputs = [ cmake python which swig ]; 34 + buildInputs = [ ncurses zlib libedit libxml2 llvm ] 34 35 ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.libobjc darwin.apple_sdk.libs.xpc ]; 35 36 36 37 CXXFLAGS = "-fno-rtti";
+11 -3
pkgs/development/compilers/llvm/4/llvm.nix
··· 38 38 mv compiler-rt-* $sourceRoot/projects/compiler-rt 39 39 ''; 40 40 41 - outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; 41 + outputs = [ "out" "man" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; 42 42 43 - buildInputs = [ perl groff cmake libxml2 python libffi ] 43 + nativeBuildInputs = [ perl groff cmake python python.pkgs.sphinx ]; 44 + buildInputs = [ libxml2 libffi ] 44 45 ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi ]; 45 46 46 47 propagatedBuildInputs = [ ncurses zlib ]; ··· 81 80 "-DLLVM_ENABLE_FFI=ON" 82 81 "-DLLVM_ENABLE_RTTI=ON" 83 82 "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code 83 + "-DLLVM_BUILD_DOCS=ON" 84 + "-DLLVM_ENABLE_SPHINX=ON" 85 + "-DSPHINX_OUTPUT_MAN=ON" 86 + "-DSPHINX_OUTPUT_HTML=OFF" 87 + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" 84 88 ] ++ stdenv.lib.optional enableSharedLibraries [ 85 89 "-DLLVM_LINK_LLVM_DYLIB=ON" 86 90 ] ++ stdenv.lib.optional (!isDarwin) ··· 109 103 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib 110 104 ''; 111 105 112 - postInstall = "" 106 + postInstall = '' 107 + moveToOutput "share/man" "$man" 108 + '' 113 109 + stdenv.lib.optionalString (enableSharedLibraries) '' 114 110 moveToOutput "lib/libLLVM-*" "$lib" 115 111 moveToOutput "lib/libLLVM.${shlib}" "$lib"
+2 -1
pkgs/development/compilers/llvm/4/openmp.nix
··· 12 12 13 13 src = fetch "openmp" "09kf41zgv551fnv628kqhlwgqkd2bkiwii9gqi6q12djgdddhmfv"; 14 14 15 - buildInputs = [ cmake llvm perl ]; 15 + nativeBuildInputs = [ cmake perl ]; 16 + buildInputs = [ llvm ]; 16 17 17 18 enableParallelBuilding = true; 18 19
+5 -5
pkgs/development/libraries/libdrm/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }: 1 + { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "libdrm-2.4.79"; 4 + name = "libdrm-2.4.81"; 5 5 6 6 src = fetchurl { 7 7 url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; 8 - sha256 = "c6aaf319293bce38023e9a637471b0f45c93c807d2a279060d741fc7a2e5b197"; 8 + sha256 = "8cc05c195ac8708199979a94c4e4d1a928c14ec338ecbcb38ead09f54dae11ae"; 9 9 }; 10 10 11 11 outputs = [ "out" "dev" ]; 12 12 13 13 nativeBuildInputs = [ pkgconfig ]; 14 - buildInputs = [ libpthreadstubs libpciaccess ]; 14 + buildInputs = [ libpthreadstubs libpciaccess valgrind-light ]; 15 15 # libdrm as of 2.4.70 does not actually do anything with udev. 16 16 17 17 patches = stdenv.lib.optional stdenv.isDarwin ./libdrm-apple.patch; ··· 19 19 preConfigure = stdenv.lib.optionalString stdenv.isDarwin 20 20 "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache"; 21 21 22 - configureFlags = [ "--disable-valgrind" ] 22 + configureFlags = [ ] 23 23 ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64) [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ] 24 24 ++ stdenv.lib.optional stdenv.isDarwin "-C"; 25 25
+8
pkgs/development/libraries/libtasn1/default.nix
··· 8 8 sha256 = "00jsix5hny0g768zv4hk78dib7w0qmk5fbizf4jj37r51nd4s6k8"; 9 9 }; 10 10 11 + patches = [ 12 + (fetchurl { 13 + name = "CVE-2017-6891.patch"; 14 + url = "https://git.savannah.gnu.org/gitweb/?p=libtasn1.git;a=patch;h=5520704d075802df25ce4ffccc010ba1641bd484"; 15 + sha256 = "000r6wb87zkx8yhzkf1c3h7p5akwhjw51cv8f1yjnplrqqrr7h2k"; 16 + }) 17 + ]; 18 + 11 19 outputs = [ "out" "dev" "devdoc" ]; 12 20 outputBin = "dev"; 13 21
+6 -7
pkgs/development/libraries/mesa/default.nix
··· 2 2 , pkgconfig, intltool, autoreconfHook, substituteAll 3 3 , file, expat, libdrm, xorg, wayland, openssl 4 4 , llvmPackages, libffi, libomxil-bellagio, libva 5 - , libelf, libvdpau, python2 5 + , libelf, libvdpau 6 6 , grsecEnabled ? false 7 7 , enableRadv ? false 8 8 # Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. ··· 36 36 then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"] 37 37 else if stdenv.isAarch64 38 38 then ["nouveau" "vc4" ] 39 - else ["i915" "ilo" "r300" "r600" "radeonsi" "nouveau"]; 39 + else ["i915" "r300" "r600" "radeonsi" "nouveau"]; 40 40 defaultDriDrivers = 41 41 if (stdenv.isArm || stdenv.isAarch64) 42 42 then ["nouveau"] ··· 67 67 in 68 68 69 69 let 70 - version = "17.0.6"; 70 + version = "17.1.1"; 71 71 branch = head (splitString "." version); 72 72 driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; 73 73 in ··· 82 82 "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" 83 83 "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" 84 84 ]; 85 - sha256 = "17d60jjzg4ddm95gk2cqx0xz6b9anmmz6ax4majwr3gis2yg7v49"; 85 + sha256 = "aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef"; 86 86 }; 87 87 88 88 prePatch = "patchShebangs ."; ··· 103 103 "--localstatedir=/var" 104 104 "--with-dri-driverdir=$(drivers)/lib/dri" 105 105 "--with-dri-searchpath=${driverLink}/lib/dri" 106 - "--with-egl-platforms=x11,wayland,drm" 106 + "--with-platforms=x11,wayland,drm" 107 107 ] 108 108 ++ (optional (galliumDrivers != []) 109 109 ("--with-gallium-drivers=" + ··· 126 126 "--enable-glx" 127 127 "--enable-glx-tls" 128 128 "--enable-gallium-osmesa" # used by wine 129 - "--enable-gallium-llvm" 129 + "--enable-llvm" 130 130 "--enable-egl" 131 131 "--enable-xa" # used in vmware driver 132 132 "--enable-gbm" ··· 152 152 libX11 libXext libxcb libXt libXfixes libxshmfence 153 153 libffi wayland libvdpau libelf libXvMC 154 154 libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/ 155 - (python2.withPackages (ps: [ ps.Mako ])) 156 155 ]; 157 156 158 157
+24 -5
pkgs/development/libraries/polkit/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, glib, expat, pam, intltool, spidermonkey_17 2 - , gobjectIntrospection, libxslt, docbook_xsl, docbook_xml_dtd_412 3 - , useSystemd ? stdenv.isLinux, systemd }: 1 + { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, glib, expat, pam 2 + , intltool, spidermonkey_17 , gobjectIntrospection, libxslt, docbook_xsl 3 + , docbook_xml_dtd_412, gtk_doc 4 + , useSystemd ? stdenv.isLinux, systemd 5 + }: 4 6 5 7 let 6 8 ··· 24 22 sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71"; 25 23 }; 26 24 25 + patches = [ 26 + (fetchpatch { 27 + url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-agent-leaks.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; 28 + sha256 = "1cxnhj0y30g7ldqq1y6zwsbdwcx7h97d3mpd3h5jy7dhg3h9ym91"; 29 + }) 30 + (fetchpatch { 31 + url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-polkitpermission-leak.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; 32 + sha256 = "1h1rkd4avqyyr8q6836zzr3w10jf521gcqnvhrhzwdpgp1ay4si7"; 33 + }) 34 + (fetchpatch { 35 + url = "http://pkgs.fedoraproject.org/cgit/rpms/polkit.git/plain/polkit-0.113-itstool.patch?id=fa6fd575804de92886c95d3bc2b7eb2abcd13760"; 36 + sha256 = "0bxmjwp8ahy1y5g1l0kxmld0l3mlvb2l0i5n1qabia3d5iyjkyfh"; 37 + }) 38 + ]; 39 + 27 40 outputs = [ "bin" "dev" "out" ]; # small man pages in $bin 28 41 42 + nativeBuildInputs = 43 + [ gtk_doc pkgconfig autoreconfHook ] 44 + ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ]; # man pages 29 45 buildInputs = 30 - [ pkgconfig glib expat pam intltool spidermonkey_17 gobjectIntrospection ] 31 - ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ] # man pages 46 + [ glib expat pam intltool spidermonkey_17 gobjectIntrospection ] 32 47 ++ stdenv.lib.optional useSystemd systemd; 33 48 34 49 # Ugly hack to overwrite hardcoded directories
+23 -1
pkgs/development/python-modules/ldap.nix
··· 1 - { buildPythonPackage, isPy3k, fetchPypi 1 + { lib, writeText, buildPythonPackage, isPy3k, fetchPypi 2 2 , openldap, cyrus_sasl, openssl }: 3 3 4 4 buildPythonPackage rec { ··· 11 11 inherit pname version; 12 12 sha256 = "88bab69e519dd8bd83becbe36bd141c174b0fe309e84936cf1bae685b31be779"; 13 13 }; 14 + 15 + # Needed by tests to setup a mockup ldap server. 16 + BIN = "${openldap}/bin"; 17 + SBIN = "${openldap}/bin"; 18 + SLAPD = "${openldap}/libexec/slapd"; 19 + SCHEMA = "${openldap}/etc/schema"; 20 + 21 + patches = lib.singleton (writeText "avoid-syslog.diff" '' 22 + diff a/Lib/slapdtest.py b/Lib/slapdtest.py 23 + --- a/Lib/slapdtest.py 24 + +++ b/Lib/slapdtest.py 25 + @@ -60,7 +60,8 @@ def combined_logger( 26 + pass 27 + # for writing to syslog 28 + new_logger = logging.getLogger(log_name) 29 + - if sys_log_format: 30 + + # /dev/log does not exist in nix build environment. 31 + + if False: 32 + my_syslog_formatter = logging.Formatter( 33 + fmt=' '.join((log_name, sys_log_format))) 34 + my_syslog_handler = logging.handlers.SysLogHandler( 35 + ''); 14 36 15 37 NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl"; 16 38 propagatedBuildInputs = [openldap cyrus_sasl openssl];
-6
pkgs/development/tools/rtags/default.nix
··· 22 22 23 23 enableParallelBuilding = true; 24 24 25 - postInstall = lib.optionalString stdenv.isDarwin '' 26 - for f in $out/bin/{rc,rdm,rp}; do 27 - install_name_tool -change @rpath/libclang.dylib ${llvmPackages.clang.cc}/lib/libclang.dylib ''${f} 28 - done 29 - ''; 30 - 31 25 meta = { 32 26 description = "C/C++ client-server indexer based on clang"; 33 27 homepage = https://github.com/andersbakken/rtags;
-18
pkgs/os-specific/darwin/apple-source-releases/CF/add-cf-initialize.patch
··· 1 - --- CF-855.17/CFRuntime.c 2014-11-26 21:29:48.000000000 -0800 2 - +++ CF-855.17/CFRuntime.c.new 2014-11-26 21:30:01.000000000 -0800 3 - @@ -756,6 +756,7 @@ 4 - extern void __CFErrorInitialize(void); 5 - extern void __CFTreeInitialize(void); 6 - extern void __CFURLInitialize(void); 7 - +extern void __CFPreferencesDomainInitialize(void); 8 - #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI 9 - extern void __CFMachPortInitialize(void); 10 - #endif 11 - @@ -1015,6 +1016,7 @@ 12 - __CFErrorInitialize(); 13 - __CFTreeInitialize(); 14 - __CFURLInitialize(); 15 - + __CFPreferencesDomainInitialize(); 16 - 17 - #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS 18 - __CFBundleInitialize();
+3 -4
pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
··· 1 - { stdenv, appleDerivation, icu, dyld, libdispatch, launchd, libclosure }: 1 + { stdenv, appleDerivation, ICU, dyld, libdispatch, libplatform, launchd, libclosure }: 2 2 3 3 # this project uses blocks, a clang-only extension 4 4 assert stdenv.cc.isClang; 5 5 6 6 appleDerivation { 7 - buildInputs = [ dyld icu libdispatch launchd libclosure ]; 7 + buildInputs = [ dyld ICU libdispatch libplatform launchd libclosure ]; 8 8 9 - patches = [ ./add-cf-initialize.patch ./add-cfmachport.patch ./cf-bridging.patch ]; 9 + patches = [ ./add-cfmachport.patch ./cf-bridging.patch ./remove-xpc.patch ]; 10 10 11 11 __propagatedImpureHostDeps = [ "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation" ]; 12 12 ··· 19 19 --replace "/bin/" "" \ 20 20 --replace "INSTALLNAME=/System" "INSTALLNAME=$out" \ 21 21 --replace "install_name_tool -id /System" "install_name_tool -id $out" \ 22 - --replace "-licucore.A" "-licui18n -licuuc" \ 23 22 --replace 'chown -RH -f root:wheel $(DSTBASE)/CoreFoundation.framework' "" \ 24 23 --replace 'chmod -RH' 'chmod -R' 25 24
+17
pkgs/os-specific/darwin/apple-source-releases/CF/remove-xpc.patch
··· 1 + diff --git a/CFBundlePriv.h b/CFBundlePriv.h 2 + index d4feb5f..e7b52e8 100644 3 + --- a/CFBundlePriv.h 4 + +++ b/CFBundlePriv.h 5 + @@ -254,12 +254,6 @@ Boolean _CFBundleGetStringsFilesShared(CFBundleRef bundle); 6 + CF_EXPORT 7 + CFURLRef _CFBundleCopyFrameworkURLForExecutablePath(CFStringRef executablePath); 8 + 9 + -#if (TARGET_OS_MAC && !(TARGET_OS_EMBEDDED || TARGET_OS_IPHONE)) || (TARGET_OS_EMBEDDED || TARGET_OS_IPHONE) 10 + -#include <xpc/xpc.h> 11 + -CF_EXPORT 12 + -void _CFBundleSetupXPCBootstrap(xpc_object_t bootstrap) CF_AVAILABLE(10_10, 8_0); 13 + -#endif 14 + - 15 + /* Functions deprecated as SPI */ 16 + 17 + CF_EXPORT
+22
pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
··· 1 + { stdenv, cctools, appleDerivation }: 2 + 3 + appleDerivation { 4 + buildInputs = [ cctools ]; 5 + 6 + postPatch = '' 7 + substituteInPlace makefile \ 8 + --replace /usr/bin/ "" \ 9 + --replace '$(ISYSROOT)' "" \ 10 + --replace 'shell xcodebuild -version -sdk' 'shell true' \ 11 + --replace 'shell xcrun -sdk $(SDKPATH) -find' 'shell echo' \ 12 + --replace '-install_name $(libdir)' "-install_name $out/lib/" \ 13 + --replace /usr/local/bin/ /bin/ \ 14 + --replace /usr/lib/ /lib/ \ 15 + ''; 16 + 17 + makeFlags = [ "DSTROOT=$(out)" ]; 18 + 19 + postInstall = '' 20 + mv $out/usr/local/include $out/include 21 + ''; 22 + }
+2 -2
pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
··· 1 1 { stdenv, appleDerivation, cpio, bootstrap_cmds, xnu, Libc, Libm, libdispatch, cctools, Libinfo, 2 2 dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto, copyfile, 3 - removefile, libresolv, Libnotify, libpthread, mDNSResponder, launchd, libutil, version }: 3 + removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }: 4 4 5 5 appleDerivation rec { 6 6 phases = [ "unpackPhase" "installPhase" ]; ··· 19 19 20 20 for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \ 21 21 ${libdispatch} ${ncurses.dev} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \ 22 - ${Libnotify} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do 22 + ${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do 23 23 (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include) 24 24 done 25 25
+8 -4
pkgs/os-specific/darwin/apple-source-releases/default.nix
··· 30 30 # is the right one, even though it isn't. The version I have here doesn't appear to be linked 31 31 # to any OS releases, but Apple also doesn't mention mDNSResponder from 10.11 to 10.11.6, and 32 32 # neither of those versions are publicly available. 33 + libplatform = "125"; 33 34 mDNSResponder = "625.41.2"; 34 35 35 36 libutil = "43"; ··· 48 47 }; 49 48 "osx-10.10.5" = { 50 49 adv_cmds = "158"; 50 + CF = "1153.18"; 51 + ICU = "531.48"; 52 + libdispatch = "442.1.4"; 51 53 Security = "57031.40.6"; 52 54 53 55 IOAudioFamily = "203.3"; ··· 70 66 IOKitUser = "1050.20.2"; 71 67 }; 72 68 "osx-10.9.5" = { 73 - CF = "855.17"; 74 69 launchd = "842.92.1"; 75 70 libauto = "185.5"; 76 71 Libc = "997.90.3"; # We use this, but not from here 77 - libdispatch = "339.92.1"; 78 72 Libsystem = "1197.1.1"; 79 73 Security = "55471.14.18"; 80 74 security_dotmac_tp = "55107.1"; ··· 191 189 bootstrap_cmds = applePackage "bootstrap_cmds" "dev-tools-7.0" "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {}; 192 190 bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {}; 193 191 CarbonHeaders = applePackage "CarbonHeaders" "osx-10.6.2" "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {}; 194 - CF = applePackage "CF" "osx-10.9.5" "1sadmxi9fsvsmdyxvg2133sdzvkzwil5fvyyidxsyk1iyfzqsvln" {}; 192 + CF = applePackage "CF" "osx-10.10.5" "07f5psjxi7wyd13ci4x83ya5hy6p69sjfqcpp2mmxdlhd8yzkf74" {}; 195 193 CommonCrypto = applePackage "CommonCrypto" "osx-10.11.6" "0vllfpb8f4f97wj2vpdd7w5k9ibnsbr6ff1zslpp6q323h01n25y" {}; 196 194 configd = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {}; 197 195 copyfile = applePackage "copyfile" "osx-10.11.6" "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {}; ··· 199 197 dtrace = applePackage "dtrace" "osx-10.11.6" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wc0" {}; 200 198 dyld = applePackage "dyld" "osx-10.11.6" "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {}; 201 199 eap8021x = applePackage "eap8021x" "osx-10.11.6" "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {}; 200 + ICU = applePackage "ICU" "osx-10.10.5" "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {}; 202 201 IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; }; 203 202 launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {}; 204 203 libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {}; ··· 211 208 }; 212 209 Libc_old = applePackage "Libc/825_40_1.nix" "osx-10.8.5" "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {}; 213 210 libclosure = applePackage "libclosure" "osx-10.11.6" "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {}; 214 - libdispatch = applePackage "libdispatch" "osx-10.9.5" "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {}; 211 + libdispatch = applePackage "libdispatch" "osx-10.10.5" "0jsfbzp87lwk9snlby0hd4zvj7j894p5q3cw0wdx9ny1mcp3kdcj" {}; 215 212 libiconv = applePackage "libiconv" "osx-10.11.6" "11h6lfajydri4widis62q8scyz7z8l6msqyx40ly4ahsdlbl0981" {}; 216 213 Libinfo = applePackage "Libinfo" "osx-10.11.6" "0qjgkd4y8sjvwjzv5wwyzkb61pg8wwg95bkp721dgzv119dqhr8x" {}; 217 214 Libm = applePackage "Libm" "osx-10.7.4" "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {}; 218 215 Libnotify = applePackage "Libnotify" "osx-10.11.6" "0zbcyxlcfhf91jxczhd5bq9qfgvg494gwwp3l7q5ayb2qdihzr8b" {}; 216 + libplatform = applePackage "libplatform" "osx-10.11.6" "1v4ik6vlklwsi0xb1g5kmhy29j9xk5m2y8xb9zbi1k4ng8x39czk" {}; 219 217 libpthread = applePackage "libpthread" "osx-10.11.6" "1kbw738cmr9pa7pz1igmajs307clfq7gv2vm1sqdzhcnnjxbl28w" {}; 220 218 libresolv = applePackage "libresolv" "osx-10.11.6" "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {}; 221 219 Libsystem = applePackage "Libsystem" "osx-10.11.6" "1nfkmbqml587v2s1d1y2s2v8nmr577jvk51y6vqrfvsrhdhc2w94" {};
+4 -1
pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
··· 6 6 installPhase = '' 7 7 mkdir -p $out/include/dispatch $out/include/os 8 8 9 - cp -r dispatch/*.h $out/include/dispatch 9 + # Move these headers so CF can find <os/voucher_private.h> 10 + mv private/voucher*.h $out/include/os 10 11 cp -r private/*.h $out/include/dispatch 12 + 13 + cp -r dispatch/*.h $out/include/dispatch 11 14 cp -r os/object*.h $out/include/os 12 15 ''; 13 16 }
+10
pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
··· 1 + { stdenv, appleDerivation }: 2 + 3 + appleDerivation { 4 + phases = [ "unpackPhase" "installPhase" ]; 5 + 6 + installPhase = '' 7 + mkdir $out 8 + cp -r include $out/include 9 + ''; 10 + }
+11 -11
pkgs/stdenv/darwin/default.nix
··· 165 165 166 166 persistent1 = prevStage: self: super: with prevStage; { 167 167 inherit 168 - zlib patchutils m4 scons flex perl bison unifdef unzip openssl icu python 168 + zlib patchutils m4 scons flex perl bison unifdef unzip openssl python 169 169 libxml2 gettext sharutils gmp libarchive ncurses pkg-config libedit groff 170 170 openssh sqlite sed serf openldap db cyrus-sasl expat apr-util subversion xz 171 171 findfreetype libssh curl cmake autoconf automake libtool ed cpio coreutils; 172 172 173 173 darwin = super.darwin // { 174 174 inherit (darwin) 175 - dyld Libsystem xnu configd libdispatch libclosure launchd; 175 + dyld Libsystem xnu configd ICU libdispatch libclosure launchd; 176 176 }; 177 177 }; 178 178 ··· 185 185 186 186 allowedRequisites = 187 187 [ bootstrapTools ] ++ 188 - (with pkgs; [ xz.bin xz.out libcxx libcxxabi icu.out ]) ++ 189 - (with pkgs.darwin; [ dyld Libsystem CF locale ]); 188 + (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++ 189 + (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]); 190 190 191 191 overrides = persistent1 prevStage; 192 192 }; ··· 221 221 222 222 allowedRequisites = 223 223 [ bootstrapTools ] ++ 224 - (with pkgs; [ xz.bin xz.out icu.out bash libcxx libcxxabi ]) ++ 225 - (with pkgs.darwin; [ dyld Libsystem locale ]); 224 + (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++ 225 + (with pkgs.darwin; [ dyld ICU Libsystem locale ]); 226 226 227 227 overrides = persistent2 prevStage; 228 228 }; ··· 256 256 persistent4 = prevStage: self: super: with prevStage; { 257 257 inherit 258 258 gnumake gzip gnused bzip2 gawk ed xz patch bash 259 - libcxxabi libcxx ncurses libffi zlib icu llvm gmp pcre gnugrep 259 + libcxxabi libcxx ncurses libffi zlib llvm gmp pcre gnugrep 260 260 coreutils findutils diffutils patchutils; 261 261 262 262 llvmPackages = super.llvmPackages // { ··· 264 264 }; 265 265 266 266 darwin = super.darwin // { 267 - inherit (darwin) dyld Libsystem cctools libiconv; 267 + inherit (darwin) dyld ICU Libsystem cctools libiconv; 268 268 }; 269 269 } // lib.optionalAttrs (super.targetPlatform == localSystem) { 270 270 # Need to get rid of these when cross-compiling. ··· 310 310 }; 311 311 312 312 allowedRequisites = (with pkgs; [ 313 - xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out 313 + xz.out xz.bin libcxx libcxxabi gmp.out gnumake findutils bzip2.out 314 314 bzip2.bin llvmPackages.llvm llvmPackages.llvm.lib zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar 315 315 gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk 316 - gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out 316 + gnugrep llvmPackages.clang-unwrapped llvmPackages.clang-unwrapped.man patch pcre.out binutils-raw.out 317 317 binutils-raw.dev binutils gettext 318 318 ]) ++ (with pkgs.darwin; [ 319 - dyld Libsystem CF cctools libiconv locale 319 + dyld Libsystem CF cctools ICU libiconv locale 320 320 ]); 321 321 322 322 overrides = self: super:
+2 -2
pkgs/tools/text/diffutils/default.nix
··· 1 1 { stdenv, fetchurl, xz, coreutils ? null }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "diffutils-3.5"; 4 + name = "diffutils-3.6"; 5 5 6 6 src = fetchurl { 7 7 url = "mirror://gnu/diffutils/${name}.tar.xz"; 8 - sha256 = "0csmqfz8ks23kdjsq0v2ll1acqiz8lva06dj19mwmymrsp69ilys"; 8 + sha256 = "1mivg0fy3a6fcn535ln8nkgfj6vxh5hsxxs5h6692wxmsjyyh8fn"; 9 9 }; 10 10 11 11 outputs = [ "out" "info" ];
+2 -1
pkgs/top-level/all-packages.nix
··· 7174 7174 valgrind = callPackage ../development/tools/analysis/valgrind { 7175 7175 inherit (darwin) xnu bootstrap_cmds cctools; 7176 7176 llvm = llvm_39; 7177 - }; 7177 + }; 7178 + valgrind-light = self.valgrind.override { gdb = null; }; 7178 7179 7179 7180 valkyrie = callPackage ../development/tools/analysis/valkyrie { }; 7180 7181