public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream

Browse Source 
This is a partial commit from staging in an attempt to make merges
smaller.
This commit is contained in:
William A. Kennington III 2015-09-23 14:35:23 -07:00
commit 5cfe893cc4
32 changed files with 3689 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/editors/emacs-24/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
, alsaLib, cairo, acl, gpm
, alsaLib, cairo, acl, gpm, AppKit, Foundation, libobjc
, withX ? !stdenv.isDarwin
, withGTK3 ? false, gtk3 ? null
, withGTK2 ? true, gtk2
@ -49,6 +49,12 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (withX && withGTK3) gtk3
++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc
];
NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
"/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
configureFlags =
if stdenv.isDarwin
then [ "--with-ns" "--disable-ns-self-contained" ]

2
pkgs/applications/kde-apps-15.04/default.nix
View File

@ -177,7 +177,7 @@ let
strigi taglib udev xorg xplanet xscreensaver xz;
alsa = alsaLib;
assuan = libassuan;
boost = boost156;
boost = boost155;
canberra = libcanberra;
eigen3 = eigen;
epub = ebook_tools;

2
pkgs/build-support/setup-hooks/patch-shebangs.sh
View File

@ -5,7 +5,7 @@
# rewritten to /nix/store/<hash>/bin/python. Interpreters that are
# already in the store are left untouched.
fixupOutputHooks+=('if [ -z "$dontPatchShebangs" ]; then patchShebangs "$prefix"; fi')
fixupOutputHooks+=('if [ -z "$dontPatchShebangs" -a -e "$prefix" ]; then patchShebangs "$prefix"; fi')
patchShebangs() {
local dir="$1"

2
pkgs/desktops/plasma-5.3/default.nix
View File

@ -129,7 +129,7 @@ let
modemmanager openconnect openexr pam pango qt4 samba
socat substituteAll taglib utillinux wayland xapian
xkeyboard_config xorg;
boost = boost156;
boost = boost155;
canberra = libcanberra;
epub = ebook_tools;
fontforge_executable = fontforge;

10
pkgs/development/libraries/boost/1.56.nix
View File

@ -1,10 +0,0 @@
{ callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.56.0";
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_56_0.tar.bz2";
sha256 = "07gz62nj767qzwqm3xjh11znpyph8gcii0cqhnx7wvismyn34iqk";
};
})

40
pkgs/development/libraries/boost/1.57.nix
View File

@ -1,40 +0,0 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.57.0";
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_57_0.tar.bz2";
sha256 = "0rs94vdmg34bwwj23fllva6mhrml2i7mvmlb11zyrk1k5818q34i";
};
patches = if stdenv.isCygwin then [
./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch
./cygwin-fedora-boost-1.50.0-pool.patch
./cygwin-fedora-boost-1.57.0-mpl-print.patch
./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch
./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch
./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch
./cygwin-fedora-boost-1.57.0-pool-test_linking.patch
./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch
./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch
./cygwin-fedora-boost-1.57.0-uuid-comparison.patch
./cygwin-fedora-boost-1.57.0-move-is_class.patch
./cygwin-1.40.0-cstdint-cygwin.patch
./cygwin-1.57.0-asio-cygwin.patch
./cygwin-1.55.0-asio-MSG_EOR.patch
./cygwin-1.57.0-config-cygwin.patch
./cygwin-1.57.0-context-cygwin.patch
./cygwin-1.57.0-filesystem-cygwin.patch
./cygwin-1.55.0-interlocked-cygwin.patch
./cygwin-1.40.0-iostreams-cygwin.patch
./cygwin-1.57.0-locale-cygwin.patch
./cygwin-1.57.0-log-cygwin.patch
./cygwin-1.40.0-python-cygwin.patch
./cygwin-1.40.0-regex-cygwin.patch
./cygwin-1.57.0-smart_ptr-cygwin.patch
./cygwin-1.57.0-system-cygwin.patch
./cygwin-1.45.0-jam-cygwin.patch
./cygwin-1.50.0-jam-pep3149.patch
] else null;
})

40
pkgs/development/libraries/boost/1.58.nix
View File

@ -1,40 +0,0 @@
{ stdenv, callPackage, fetchurl, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "1.58.0";
src = fetchurl {
url = "mirror://sourceforge/boost/boost_1_58_0.tar.bz2";
sha256 = "1rfkqxns60171q62cppiyzj8pmsbwp1l8jd7p6crriryqd7j1z7x";
};
patches = if stdenv.isCygwin then [
./cygwin-fedora-boost-1.50.0-fix-non-utf8-files.patch
./cygwin-fedora-boost-1.50.0-pool.patch
./cygwin-fedora-boost-1.57.0-mpl-print.patch
./cygwin-fedora-boost-1.57.0-spirit-unused_typedef.patch
./cygwin-fedora-boost-1.54.0-locale-unused_typedef.patch
./cygwin-fedora-boost-1.54.0-python-unused_typedef.patch
./cygwin-fedora-boost-1.57.0-pool-test_linking.patch
./cygwin-fedora-boost-1.54.0-pool-max_chunks_shadow.patch
./cygwin-fedora-boost-1.57.0-signals2-weak_ptr.patch
./cygwin-fedora-boost-1.57.0-uuid-comparison.patch
./cygwin-fedora-boost-1.57.0-move-is_class.patch
./cygwin-1.40.0-cstdint-cygwin.patch
./cygwin-1.57.0-asio-cygwin.patch
./cygwin-1.55.0-asio-MSG_EOR.patch
./cygwin-1.57.0-config-cygwin.patch
./cygwin-1.57.0-context-cygwin.patch
./cygwin-1.57.0-filesystem-cygwin.patch
./cygwin-1.55.0-interlocked-cygwin.patch
./cygwin-1.40.0-iostreams-cygwin.patch
./cygwin-1.57.0-locale-cygwin.patch
./cygwin-1.57.0-log-cygwin.patch
./cygwin-1.40.0-python-cygwin.patch
./cygwin-1.40.0-regex-cygwin.patch
./cygwin-1.57.0-smart_ptr-cygwin.patch
./cygwin-1.57.0-system-cygwin.patch
./cygwin-1.45.0-jam-cygwin.patch
./cygwin-1.50.0-jam-pep3149.patch
] else null;
})

6
pkgs/development/libraries/folly/default.nix
View File

@ -2,14 +2,14 @@
, google-gflags, python, libiberty, openssl }:
stdenv.mkDerivation rec {
version = "0.57.0";
version = "2015-09-17";
name = "folly-${version}";
src = fetchFromGitHub {
owner = "facebook";
repo = "folly";
rev = "v${version}";
sha256 = "12b9bkwmndfwmsknc209kpplxn9wqmwr3p2h0l2szrppq4qqyfq9";
rev = "e4527fb5d04f5fec823bd6a2402b620a6e1a64e3";
sha256 = "0iicq19yylafr7qs221xgk8pcwf6nnyx6srgsx9y9cyf72siadcb";
};
nativeBuildInputs = [ autoreconfHook python ];

8
pkgs/development/libraries/gdk-pixbuf/default.nix
View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11
, jasper, libintlOrEmpty, gobjectIntrospection }:
, jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }:
let
ver_maj = "2.31";
ver_min = "6";
ver_min = "7";
in
stdenv.mkDerivation rec {
name = "gdk-pixbuf-${ver_maj}.${ver_min}";
src = fetchurl {
url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
sha256 = "062x2gqd7p6yxhxlib1ha4l3gk9ihcj080hrwwv9vmlmybb064hi";
sha256 = "046n9wz16kh3rpzxaiiwphf5bihxgj4g14cjn65wwmw82q4y0dj7";
};
setupHook = ./setup-hook.sh;
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
;
# The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
doCheck = false;
inherit (doCheck);
postInstall = "rm -rf $out/share/gtk-doc";

16
pkgs/development/libraries/gtk+/3.x.nix
View File

@ -10,7 +10,7 @@ assert cupsSupport -> cups != null;
let
ver_maj = "3.16";
ver_min = "6";
ver_min = "7";
version = "${ver_maj}.${ver_min}";
in
stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
sha256 = "1gpzlnfrifc17yfk0zki6b2vmsfpf5cmrbh232s6iaan11np44jd";
sha256 = "1fkzdhqa1pjzb1qsh2ll3y2567ylyszks59qspx85lalvqa9ss0r";
};
nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
@ -30,13 +30,13 @@ stdenv.mkDerivation rec {
++ optional xineramaSupport libXinerama
++ optional cupsSupport cups;
NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
# demos fail to install, no idea where's the problem
preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in";
enableParallelBuilding = true;
NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
postInstall = "rm -rf $out/share/gtk-doc";
passthru = {
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
''; # workaround for bug of nix-mode for Emacs */ '';
};
meta = {
meta = with stdenv.lib; {
description = "A multi-platform toolkit for creating graphical user interfaces";
longDescription = ''
@ -62,9 +62,9 @@ stdenv.mkDerivation rec {
homepage = http://www.gtk.org/;
license = stdenv.lib.licenses.lgpl2Plus;
license = licenses.lgpl2Plus;
maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ];
platforms = stdenv.lib.platforms.all;
maintainers = with maintainers; [ urkud raskin vcunat lethalman ];
platforms = platforms.all;
};
}

4
pkgs/development/libraries/harfbuzz/default.nix
View File

@ -8,11 +8,11 @@
# (icu is a ~30 MB dependency, the rest is very small in comparison)
stdenv.mkDerivation rec {
name = "harfbuzz-1.0.2";
name = "harfbuzz-1.0.3";
src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
sha256 = "0rmlwfxyzdblnvg72hpfcz2py8rjflx0m08wlvfgq420cpwcmcxy";
sha256 = "1xrxlrvgyr6mm9qjxmkif2kvcah082y94gf1vqi0f0bdl1g8gp7b";
};
outputs = [ "out" "doc" ];

2
pkgs/development/libraries/kde-frameworks-5.10/default.nix
View File

@ -117,7 +117,7 @@ let
inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
libgcrypt libgit2 modemmanager networkmanager perl
perlPackages qimageblitz xorg zlib;
boost = boost156;
boost = boost155;
gif = giflib;
glib2 = glib;
jpeg = libjpeg;

2
pkgs/development/libraries/kde-frameworks-5.12/default.nix
View File

@ -117,7 +117,7 @@ let
inherit acl cmake docbook_xml_dtd_45 docbook5_xsl epoxy fam gpgme
libgcrypt libgit2 modemmanager networkmanager perl
perlPackages qimageblitz xorg zlib;
boost = boost156;
boost = boost155;
gif = giflib;
glib2 = glib;
jpeg = libjpeg;

4
pkgs/development/libraries/libdrm/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }:
stdenv.mkDerivation rec {
name = "libdrm-2.4.64";
name = "libdrm-2.4.65";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "1dilm6cwqfx9plf3i5kkaf6m5v1zyrcadqbcjsrsshkfgpz8c1xn";
sha256 = "71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4";
};
nativeBuildInputs = [ pkgconfig ];

4
pkgs/development/libraries/libtiff/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }:
let
version = "4.0.5";
version = "4.0.6";
in
stdenv.mkDerivation rec {
name = "libtiff-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
[ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz"
"http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"
];
sha256 = "171hgy4mylwmvdm7gp6ffjva81m4j56v3fbqsbfl7avzxn1slpp2";
sha256 = "136nf1rj9dp5jgv1p7z4dk0xy3wki1w0vfjbk82f645m0w4samsd";
};
outputs = [ "out" "doc" "man" ];

4
pkgs/development/libraries/libuv/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig
{ stdenv, lib, fetchFromGitHub, autoconf, automake, realLibtool, pkgconfig
, ApplicationServices, CoreServices }:
@ -61,7 +61,7 @@ let
mkWithAutotools = stability: version: sha256: stdenv.mkDerivation {
name = mkName stability version;
src = mkSrc version sha256;
buildInputs = [ automake autoconf libtool pkgconfig ]
buildInputs = [ automake autoconf realLibtool pkgconfig ]
++ stdenv.lib.optionals stdenv.isDarwin [ ApplicationServices CoreServices ];
preConfigure = ''
LIBTOOLIZE=libtoolize ./autogen.sh

9
pkgs/development/libraries/mesa-darwin/default.nix
View File

@ -2,6 +2,7 @@
, python, libxml2Python, file, expat, makedepend, xorg, llvm, libffi, libvdpau
, enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
, enableExtraFeatures ? false # not maintained
, darwin
}:
let
@ -22,12 +23,20 @@ let
presentproto
libX11 libXext libxcb libXt libxshmfence
libffi libvdpau
] ++ stdenv.lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.OpenGL
darwin.apple_sdk.sdk
darwin.apple_sdk.libs.Xplugin
];
postUnpack = ''
ln -s darwin $sourceRoot/configs/current
'';
preBuild = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace bin/mklib --replace g++ clang++
'';
patches = [
./patches/0003-mesa-fix-per-level-max-texture-size-error-checking.patch
./patches/0008-glsl-initialise-const-force-glsl-extension-warning-i.patch

4
pkgs/development/libraries/mesa/default.nix
View File

@ -22,7 +22,7 @@ else
*/
let
version = "10.6.7";
version = "10.6.8";
# this is the default search path for DRI drivers
driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
in
@ -36,7 +36,7 @@ stdenv.mkDerivation {
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
"ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
];
sha256 = "feb1f640b915dada88a7c793dfaff0ae23580f8903f87a6b76469253de0d28d8";
sha256 = "e36ee5ceeadb3966fb5ce5b4cf18322dbb76a4f075558ae49c3bba94f57d58fd";
};
prePatch = "patchShebangs .";

9
pkgs/development/libraries/pcre/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true
{ stdenv, fetchurl, autoreconfHook, unicodeSupport ? true, cplusplusSupport ? true
, windows ? null
}:
@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
sha256 = "17bqykp604p7376wj3q2nmjdhrb6v1ny8q08zdwi7qvc02l9wrsi";
};
nativeBuildInputs = [ autoreconfHook ];
# A bundle of fixes which should be removed for 8.38
patchPhase = ''
patch -p0 -i ${./fixes.patch}
'';
outputs = [ "out" "doc" "man" ];
configureFlags = ''

3538
pkgs/development/libraries/pcre/fixes.patch Normal file
View File

File diff suppressed because one or more lines are too long

4
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -11,7 +11,7 @@ assert wantPS -> (ps != null);
let
os = stdenv.lib.optionalString;
majorVersion = "3.3";
minorVersion = "1";
minorVersion = "2";
version = "${majorVersion}.${minorVersion}";
in
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
sha256 = "1mp32dqywk4dfw7zmpgp31axszv7h74yk69g273z21q7d8n04rfd";
sha256 = "08pwy9ip9cgwgynhn5vrjw8drw29gijy1rmziq22n65zds6ifnp7";
};
enableParallelBuilding = true;

6
pkgs/development/tools/misc/autogen/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "autogen-${version}";
version = "5.18.5";
version = "5.18.6";
src = fetchurl {
url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.gz";
sha256 = "1flnbnmkbqmbfgammkl8m36wrlk6rhpgnf9pdm6gdfhqalxvggbv";
url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.xz";
sha256 = "0sfmmy19k9z0j3f738fyk6ljf6b66410cvd5zzyplxi2683j10qs";
};
nativeBuildInputs = [ which pkgconfig perl ];

6
pkgs/os-specific/darwin/apple-sdk/default.nix
View File

@ -120,7 +120,7 @@ in rec {
__propagatedImpureHostDeps = [ "/usr/lib/libXplugin.1.dylib" ];
propagatedBuildInputs = with frameworks; [
OpenGL ApplicationServices Carbon IOKit CoreFoundation CoreGraphics CoreServices CoreText
OpenGL ApplicationServices Carbon IOKit CF CoreGraphics CoreServices CoreText
];
installPhase = ''
@ -144,9 +144,7 @@ in rec {
};
};
frameworks = (stdenv.lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs; })) // {
CoreFoundation = CF;
};
frameworks = stdenv.lib.mapAttrs framework (import ./frameworks.nix { inherit frameworks libs CF; });
inherit sdk;
}

76
pkgs/os-specific/darwin/apple-sdk/frameworks.nix
View File

@ -2,76 +2,76 @@
# Epic weird knot-tying happening here.
# TODO: clean up the process for generating this and include it
{ frameworks, libs }:
{ frameworks, libs, CF }:
with frameworks; with libs; {
AGL = [ Carbon OpenGL ];
AVFoundation = [ ApplicationServices CoreGraphics ];
AVKit = [];
Accounts = [];
AddressBook = [ Carbon CoreFoundation ];
AddressBook = [ Carbon CF ];
AppKit = [ AudioToolbox QuartzCore ];
AppKitScripting = [];
AppleScriptKit = [];
AppleScriptObjC = [];
AppleShareClientCore = [ CoreServices ];
AudioToolbox = [ AudioUnit CoreAudio CoreFoundation CoreMIDI ];
AudioUnit = [ Carbon CoreAudio CoreFoundation ];
AudioToolbox = [ AudioUnit CoreAudio CF CoreMIDI ];
AudioUnit = [ Carbon CoreAudio CF ];
AudioVideoBridging = [ Foundation ];
Automator = [];
CFNetwork = [ CoreFoundation ];
CFNetwork = [ CF ];
CalendarStore = [];
Cocoa = [];
Collaboration = [];
CoreAudio = [ CoreFoundation IOKit ];
CoreAudio = [ CF IOKit ];
CoreAudioKit = [ AudioUnit ];
CoreData = [];
CoreGraphics = [ Accelerate CoreFoundation IOKit IOSurface SystemConfiguration ];
CoreGraphics = [ Accelerate CF IOKit IOSurface SystemConfiguration ];
CoreLocation = [];
CoreMIDI = [ CoreFoundation ];
CoreMIDI = [ CF ];
CoreMIDIServer = [];
CoreMedia = [ ApplicationServices AudioToolbox CoreAudio CoreFoundation CoreGraphics CoreVideo ];
CoreMediaIO = [ CoreFoundation CoreMedia ];
CoreText = [ CoreFoundation CoreGraphics ];
CoreVideo = [ ApplicationServices CoreFoundation CoreGraphics IOSurface OpenGL ];
CoreMedia = [ ApplicationServices AudioToolbox CoreAudio CF CoreGraphics CoreVideo ];
CoreMediaIO = [ CF CoreMedia ];
CoreText = [ CF CoreGraphics ];
CoreVideo = [ ApplicationServices CF CoreGraphics IOSurface OpenGL ];
CoreWLAN = [ SecurityFoundation ];
DVComponentGlue = [ CoreServices QuickTime ];
DVDPlayback = [];
DirectoryService = [ CoreFoundation ];
DiscRecording = [ CoreFoundation CoreServices IOKit ];
DirectoryService = [ CF ];
DiscRecording = [ CF CoreServices IOKit ];
DiscRecordingUI = [];
DiskArbitration = [ CoreFoundation IOKit ];
DiskArbitration = [ CF IOKit ];
DrawSprocket = [ Carbon ];
EventKit = [];
ExceptionHandling = [];
FWAUserLib = [];
ForceFeedback = [ CoreFoundation IOKit ];
Foundation = [ CoreFoundation Security ApplicationServices AppKit SystemConfiguration ];
GLKit = [ CoreFoundation ];
ForceFeedback = [ CF IOKit ];
Foundation = [ CF Security ApplicationServices AppKit SystemConfiguration ];
GLKit = [ CF ];
GLUT = [ GL OpenGL ];
GSS = [];
GameController = [];
GameKit = [ Foundation ];
ICADevices = [ Carbon CoreFoundation IOBluetooth ];
ICADevices = [ Carbon CF IOBluetooth ];
IMServicePlugIn = [];
IOBluetoothUI = [ IOBluetooth ];
IOKit = [ CoreFoundation ];
IOSurface = [ CoreFoundation IOKit xpc ];
IOKit = [ CF ];
IOSurface = [ CF IOKit xpc ];
ImageCaptureCore = [];
ImageIO = [ CoreFoundation CoreGraphics ];
ImageIO = [ CF CoreGraphics ];
InputMethodKit = [ Carbon ];
InstallerPlugins = [];
InstantMessage = [];
JavaFrameEmbedding = [];
JavaScriptCore = [ CoreFoundation ];
JavaScriptCore = [ CF ];
Kerberos = [];
Kernel = [ CoreFoundation IOKit ];
Kernel = [ CF IOKit ];
LDAP = [];
LatentSemanticMapping = [ Carbon CoreFoundation ];
LatentSemanticMapping = [ Carbon CF ];
MapKit = [];
MediaAccessibility = [ CoreFoundation CoreGraphics CoreText QuartzCore ];
MediaToolbox = [ AudioToolbox CoreFoundation CoreMedia ];
NetFS = [ CoreFoundation ];
MediaAccessibility = [ CF CoreGraphics CoreText QuartzCore ];
MediaToolbox = [ AudioToolbox CF CoreMedia ];
NetFS = [ CF ];
OSAKit = [ Carbon ];
OpenAL = [];
OpenCL = [ IOSurface OpenGL ];
@ -81,7 +81,7 @@ with frameworks; with libs; {
PubSub = [];
Python = [ ApplicationServices ];
QTKit = [ QuickTime ];
QuickLook = [ ApplicationServices CoreFoundation ];
QuickLook = [ ApplicationServices CF ];
QuickTime = [ ApplicationServices AudioUnit Carbon CoreAudio CoreServices OpenGL QuartzCore ];
Ruby = [];
RubyCocoa = [];
@ -89,31 +89,31 @@ with frameworks; with libs; {
ScreenSaver = [];
Scripting = [];
ScriptingBridge = [];
Security = [ CoreFoundation IOKit ];
Security = [ CF IOKit ];
SecurityFoundation = [];
SecurityInterface = [ Security ];
ServiceManagement = [ CoreFoundation Security ];
ServiceManagement = [ CF Security ];
Social = [];
SpriteKit = [];
StoreKit = [];
SyncServices = [];
SystemConfiguration = [ CoreFoundation Security ];
SystemConfiguration = [ CF Security ];
TWAIN = [ Carbon ];
Tcl = [];
Tk = [ ApplicationServices Carbon X11 ];
VideoDecodeAcceleration = [ CoreFoundation CoreVideo ];
VideoToolbox = [ CoreFoundation CoreMedia CoreVideo ];
VideoDecodeAcceleration = [ CF CoreVideo ];
VideoToolbox = [ CF CoreMedia CoreVideo ];
WebKit = [ ApplicationServices Carbon JavaScriptCore OpenGL X11 ];
# Umbrellas
Accelerate = [ CoreWLAN IOBluetooth ];
ApplicationServices = [ CoreFoundation CoreServices CoreText ImageIO ];
Carbon = [ ApplicationServices CoreFoundation CoreServices IOKit Security QuartzCore ];
ApplicationServices = [ CF CoreServices CoreText ImageIO ];
Carbon = [ ApplicationServices CF CoreServices IOKit Security QuartzCore ];
CoreBluetooth = [];
CoreServices = [ CFNetwork CoreAudio CoreData CoreFoundation DiskArbitration Security NetFS OpenDirectory ServiceManagement ];
CoreServices = [ CFNetwork CoreAudio CoreData CF DiskArbitration Security NetFS OpenDirectory ServiceManagement ];
IOBluetooth = [ IOKit ];
JavaVM = [];
OpenDirectory = [];
Quartz = [ QuickLook ];
QuartzCore = [ ApplicationServices CoreFoundation CoreVideo OpenCL ];
QuartzCore = [ ApplicationServices CF CoreVideo OpenCL ];
}

3
pkgs/os-specific/darwin/apple-sdk/impure-deps.nix
View File

@ -6,7 +6,6 @@ rec {
];
IOKit = [
"/System/Library/Frameworks/IOKit.framework"
"/usr/lib/libenergytrace.dylib"
];
DiskArbitration = [
"/System/Library/Frameworks/DiskArbitration.framework"
@ -31,8 +30,6 @@ rec {
"/System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore"
"/System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC"
"/System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling"
"/usr/lib/libChineseTokenizer.dylib"
"/usr/lib/libmarisa.dylib"
"/usr/lib/libmecabra.dylib"
"/usr/lib/libcmph.dylib"
"/usr/lib/libiconv.2.dylib"

5
pkgs/os-specific/darwin/apple-source-releases/CF/default.nix
View File

@ -47,8 +47,9 @@ appleDerivation {
'';
postInstall = ''
# gross! convince apple to release this as part of CF
cp /System/Library/Frameworks/CoreFoundation.framework/Headers/CFAttributedString.h "$out/System/Library/Frameworks/CoreFoundation.framework/Headers"
# gross! convince apple to release these as part of CF
cp /System/Library/Frameworks/CoreFoundation.framework/Headers/{CFAttributedString,CFNotificationCenter}.h \
"$out/System/Library/Frameworks/CoreFoundation.framework/Headers"
mv $out/System/* $out
rmdir $out/System

4
pkgs/os-specific/darwin/cctools/port.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, autoconf, automake, libtool
{ stdenv, fetchurl, autoconf, automake, libtool_2
, llvm, libcxx, libcxxabi, clang, openssl, libuuid
, libobjc ? null
}:
@ -18,7 +18,7 @@ let
sha256 = "01f31ijpnplbiyp7ldwzy8vbkn3j3m56n5blsvsav5nlp4lp2g71";
};
buildInputs = [ autoconf automake libtool openssl libuuid ] ++
buildInputs = [ autoconf automake libtool_2 openssl libuuid ] ++
# Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang)
stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++
stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];

4
pkgs/servers/x11/xorg/overrides.nix
View File

@ -93,6 +93,10 @@ in
outputs = [ "out" "man" ];
};
libAppleWM = attrs: attrs // {
propagatedBuildInputs = [ args.apple_sdk.frameworks.ApplicationServices ];
};
libXfont = attrs: attrs // {
propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2
# prevents "misaligned_stack_error_entering_dyld_stub_binder"

15
pkgs/tools/archivers/cpio/darwin-fix.patch
View File

@ -1,15 +0,0 @@
Fix Darwin builds.
From <http://git.savannah.gnu.org/cgit/cpio.git/commit/?id=3a7a1820d4cecbd77c7b74c785af5942510bf080>.
See also <http://lists.gnu.org/archive/html/bug-cpio/2010-07/msg00001.html>.
diff --git a/src/filetypes.h b/src/filetypes.h
index f80faab..81f0c32 100644
--- a/src/filetypes.h
+++ b/src/filetypes.h
@@ -81,5 +81,3 @@
#ifndef S_ISLNK
#define lstat stat
#endif
-int lstat ();
-int stat ();

34
pkgs/tools/archivers/cpio/default.nix
View File

@ -1,36 +1,32 @@
{ stdenv, fetchurl, fetchpatch }:
stdenv.mkDerivation {
name = "cpio-2.11";
let
version = "2.12";
name = "cpio-${version}";
in stdenv.mkDerivation {
inherit name;
src = fetchurl {
url = mirror://gnu/cpio/cpio-2.11.tar.bz2;
sha256 = "bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd";
url = "mirror://gnu/cpio/${name}.tar.bz2";
sha256 = "0vi9q475h1rki53100zml75vxsykzyhrn70hidy41s5c2rc8r6bh";
};
patches = [
./no-gets.patch
(fetchpatch {
name = "CVE-2014-9112.diff";
url = "http://pkgs.fedoraproject.org/cgit/cpio.git/plain/cpio-2.11"
+ "-CVE-2014-9112.patch?h=f21&id=b475b4d6f31c95e073edc95c742a33a39ef4ec95";
sha256 = "0c9yrysvpwbmiq7ph84dk6mv46hddiyvkgya1zsmj76n9ypb1b4i";
name = "CVE-2015-1197-cpio-2.12.patch";
url = "https://gist.github.com/nckx/70b0bfa80ddfb86c2967/"
+ "raw/e9b40d4d4b701f584f826775b75beb10751dc884/"
+ "CVE-2015-1197-cpio-2.12.patch";
sha256 = "0ph43m4lavwkc4gnl5h9p3da4kb1pnhwk5l2qsky70dqri8pcr8v";
})
] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-fix.patch;
postPatch = let pp =
fetchpatch {
name = "CVE-2015-1197.diff";
url = "https://marc.info/?l=oss-security&m=142289947619786&w=2";
sha256 = "0fr95bj416zfljv40fl1sh50059d18wdmfgaq8ad2fqi5cnbk859";
};
# one "<" and one "&" sign get mangled in the patch
in "cat ${pp} | sed 's/&lt;/</;s/&amp;/\\&/' | patch -p1";
];
preConfigure = if stdenv.isCygwin then ''
sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
'' else null;
enableParallelBuilding = true;
meta = {
homepage = http://www.gnu.org/software/cpio/;
description = "A program to create or extract from cpio archives";

24
pkgs/tools/archivers/cpio/no-gets.patch
View File

@ -1,24 +0,0 @@
https://bugs.gentoo.org/424974
hack until gzip pulls a newer gnulib version
From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Thu, 29 Mar 2012 13:30:41 -0600
Subject: [PATCH] stdio: don't assume gets any more
Gnulib intentionally does not have a gets module, and now that C11
and glibc have dropped it, we should be more proactive about warning
any user on a platform that still has a declaration of this dangerous
interface.
--- a/gnu/stdio.in.h
+++ b/gnu/stdio.in.h
@@ -125,7 +125,6 @@
so any use of gets warrants an unconditional warning. Assume it is
always declared, since it is required by C89. */
#undef gets
-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
#if @GNULIB_FOPEN@
# if @REPLACE_FOPEN@

51
pkgs/top-level/all-packages.nix
View File

@ -258,7 +258,7 @@ let
autonix = import ../build-support/autonix { inherit pkgs; };
autoreconfHook = makeSetupHook
{ substitutions = { inherit autoconf automake libtool gettext; }; }
{ substitutions = { inherit autoconf automake gettext; libtool = realLibtool; }; }
../build-support/setup-hooks/autoreconf.sh;
buildEnv = callPackage ../build-support/buildenv {};
@ -1044,7 +1044,7 @@ let
cksfv = callPackage ../tools/networking/cksfv { };
clementine = callPackage ../applications/audio/clementine {
boost = boost156;
boost = boost155;
gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ];
};
@ -1695,7 +1695,7 @@ let
calamares = callPackage ../tools/misc/calamares rec {
python = python3;
boost = callPackage ../development/libraries/boost/1.57.nix { python=python3; };
boost = pkgs.boost.override { python=python3; };
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { makePIC=true; boost=boost; };
inherit (kf5_stable) extra-cmake-modules kconfig ki18n kcoreaddons solid;
};
@ -2008,10 +2008,9 @@ let
nodejs-0_12 = callPackage ../development/web/nodejs {
libuv = libuvVersions.v1_6_1;
libtool = darwin.cctools;
};
nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix {
libtool = darwin.cctools;
inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices Carbon Foundation;
};
@ -5576,7 +5575,11 @@ let
lemon = callPackage ../development/tools/parsing/lemon { };
libtool = libtool_2;
libtool = if stdenv.isDarwin
then darwin.cctools
else realLibtool;
realLibtool = libtool_2;
libtool_1_5 = callPackage ../development/tools/misc/libtool { };
@ -5781,7 +5784,7 @@ let
texi2html = callPackage ../development/tools/misc/texi2html { };
uhd = callPackage ../development/tools/misc/uhd {
boost = boost157;
boost = boost155;
};
uisp = callPackage ../development/tools/misc/uisp { };
@ -5911,9 +5914,6 @@ let
boolstuff = callPackage ../development/libraries/boolstuff { };
boost155 = callPackage ../development/libraries/boost/1.55.nix { };
boost156 = callPackage ../development/libraries/boost/1.56.nix { };
boost157 = callPackage ../development/libraries/boost/1.57.nix { };
boost158 = callPackage ../development/libraries/boost/1.58.nix { };
boost159 = callPackage ../development/libraries/boost/1.59.nix { };
boost = boost159;
@ -6193,9 +6193,7 @@ let
fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {};
folly = callPackage ../development/libraries/folly {
boost = boost157;
};
folly = callPackage ../development/libraries/folly { };
makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:
callPackage ../development/libraries/fontconfig/make-fonts-conf.nix {
@ -6397,7 +6395,7 @@ let
qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost156;};
qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155;};
gnet = callPackage ../development/libraries/gnet { };
@ -8529,7 +8527,7 @@ let
lucene = callPackage ../development/libraries/java/lucene { };
lucenepp = callPackage ../development/libraries/lucene++ {
boost = boost157;
boost = boost155;
};
mockobjects = callPackage ../development/libraries/java/mockobjects { };
@ -9141,7 +9139,7 @@ let
rethinkdb = callPackage ../servers/nosql/rethinkdb { };
rippled = callPackage ../servers/rippled {
boost = boost157;
boost = boost155;
};
ripple-rest = callPackage ../servers/rippled/ripple-rest.nix { };
@ -9255,6 +9253,11 @@ let
quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; };
xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix {
inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
libxslt expat libpng zlib perl mesa_drivers spice_protocol
dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman;
inherit (darwin) apple_sdk;
bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
mesa = mesa_noglu;
udev = if stdenv.isLinux then udev else null;
@ -10653,7 +10656,7 @@ let
schismtracker = callPackage ../applications/audio/schismtracker { };
altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins {
callPackage = newScope { boost = boost157; };
callPackage = newScope { boost = boost155; };
} );
bitcoin = altcoins.bitcoin;
bitcoin-xt = altcoins.bitcoin-xt;
@ -11009,6 +11012,8 @@ let
imagemagick = null;
acl = null;
gpm = null;
inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
inherit (darwin) libobjc;
};
emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {
@ -11375,7 +11380,7 @@ let
fomp = callPackage ../applications/audio/fomp { };
freecad = callPackage ../applications/graphics/freecad {
boost = boost156;
boost = boost155;
opencascade = opencascade_6_5;
inherit (pythonPackages) matplotlib pycollada;
};
@ -11398,7 +11403,7 @@ let
};
freicoin = callPackage ../applications/misc/freicoin {
boost = boost157;
boost = boost155;
};
fuze = callPackage ../applications/networking/instant-messengers/fuze {};
@ -11848,7 +11853,7 @@ let
ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { };
ledger3 = callPackage ../applications/office/ledger {
boost = boost157;
boost = boost155;
};
ledger = ledger3;
@ -13864,7 +13869,7 @@ let
{
libusb = libusb1;
libcanberra = libcanberra_kde;
boost = boost156;
boost = boost155;
kdelibs = kdeApps_stable.kdelibs;
}
../desktops/kde-4.14;
@ -13918,7 +13923,7 @@ let
kdevelop = callPackage ../applications/editors/kdevelop { };
kdevplatform = callPackage ../development/libraries/kdevplatform {
boost = boost156;
boost = boost155;
};
kdiff3 = callPackage ../tools/text/kdiff3 { };
@ -13950,7 +13955,7 @@ let
libalkimia = callPackage ../development/libraries/libalkimia { };
libktorrent = callPackage ../development/libraries/libktorrent {
boost = boost156;
boost = boost155;
};
libkvkontakte = callPackage ../development/libraries/libkvkontakte { };