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

Merge branch 'staging'

Browse Source
This commit is contained in:
Vladimír Čunát
2017-04-14 10:32:13 +02:00
parent 3085e95a20 304d30ce3f
commit 24444513fb
75 changed files with 1451 additions and 2704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/glibc/common.nix
View File

@@ -48,7 +48,8 @@ stdenv.mkDerivation ({
"/bin:/usr/bin", which is inappropriate on NixOS machines. This
patch extends the search path by "/run/current-system/sw/bin". */
./fix_path_attribute_in_getconf.patch
];
]
++ lib.optional stdenv.isi686 ./fix-i686-memchr.patch;
postPatch =
# Needed for glibc to build with the gnumake 3.82

23
pkgs/development/libraries/glibc/fix-i686-memchr.patch Normal file
View File

@@ -0,0 +1,23 @@
Fix i686 memchr overflow calculation (BZ#21182)
https://sourceware.org/git/?p=glibc.git;a=commit;h=3abeeec5f46ff03
diff --git a/sysdeps/i386/i686/multiarch/memchr-sse2.S b/sysdeps/i386/i686/multiarch/memchr-sse2.S
index 910679c..e41f324 100644
--- a/sysdeps/i386/i686/multiarch/memchr-sse2.S
+++ b/sysdeps/i386/i686/multiarch/memchr-sse2.S
@@ -117,7 +117,6 @@ L(crosscache):
# ifndef USE_AS_RAWMEMCHR
jnz L(match_case2_prolog1)
- lea -16(%edx), %edx
/* Calculate the last acceptable address and check for possible
addition overflow by using satured math:
edx = ecx + edx
@@ -125,6 +124,7 @@ L(crosscache):
add %ecx, %edx
sbb %eax, %eax
or %eax, %edx
+ sub $16, %edx
jbe L(return_null)
lea 16(%edi), %edi
# else

4
pkgs/development/libraries/gmp/6.x.nix
View File

@@ -3,11 +3,11 @@
let inherit (stdenv.lib) optional optionalString; in
let self = stdenv.mkDerivation rec {
name = "gmp-6.1.1";
name = "gmp-6.1.2";
src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
urls = [ "mirror://gnu/gmp/${name}.tar.bz2" "ftp://ftp.gmplib.org/pub/${name}/${name}.tar.bz2" ];
sha256 = "1mpzprdzkgfpdc1v2lf4dxlxps4x8bvmzvd8n1ri6gw9y9jrh458";
sha256 = "1clg7pbpk6qwxj5b2mw0pghzawp2qlm3jf9gdd8i6fl6yh2bnxaj";
};
#outputs TODO: split $cxx due to libstdc++ dependency

10
pkgs/development/libraries/gnutls/3.5.10.nix Normal file
View File

@@ -0,0 +1,10 @@
{ callPackage, fetchurl, libunistring, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.5.10";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g";
};
})

12
pkgs/development/libraries/gnutls/3.5.nix
View File

@@ -1,10 +1,18 @@
{ callPackage, fetchurl, libunistring, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "3.5.10";
version = "3.5.11";
src = fetchurl {
url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz";
sha256 = "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g";
sha256 = "13z2dxxyrsb7gfpl1k2kafqh2zaigi872y5xgykhs9cyaz2mqxji";
};
# Skip two tests introduced in 3.5.11. Probable reasons of failure:
# - pkgconfig: building against the result won't work before installing
# - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox
postPatch = ''
sed '2iexit 77' -i tests/pkgconfig.sh
sed '/^void doit(void)/,$s/{/{ exit(77);/; t' -i tests/trust-store.c
'';
})

9
pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
View File

@@ -57,16 +57,15 @@ diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
index 838d343..ca7fc0d 100644
--- a/giscanner/shlibs.py
+++ b/giscanner/shlibs.py
@@ -53,10 +53,27 @@ def _resolve_libtool(options, binary, libraries):
@@ -53,10 +53,24 @@ def _resolve_libtool(options, binary, libraries):
# Match absolute paths on OS X to conform to how libraries are usually
# referenced on OS X systems.
def _ldd_library_pattern(library_name):
+ nix_store_dir = re.escape('@nixStoreDir@'.rstrip('/'))
pattern = "(?<![A-Za-z0-9_-])(lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
if platform.system() == 'Darwin':
pattern = "([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
- if platform.system() == 'Darwin':
- pattern = "([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
- return re.compile(pattern % re.escape(library_name))
+ return re.compile(pattern % re.escape(library_name))
+ pattern = r'''
+ (
+ (?:
@@ -86,7 +85,7 @@ index 838d343..ca7fc0d 100644
# This is a what we do for non-la files. We assume that we are on an
@@ -115,7 +132,11 @@ def _resolve_non_libtool(options, binary, libraries):
@@ -115,7 +129,11 @@ def _resolve_non_libtool(options, binary, libraries):
m = pattern.search(line)
if m:
del patterns[library]

7
pkgs/development/libraries/gtk-mac-integration/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk, gobjectIntrospection }:
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig, glib, gtk_doc, gtk }:
stdenv.mkDerivation rec {
name = "gtk-mac-integration-2.0.8";
@@ -10,9 +10,8 @@ stdenv.mkDerivation rec {
sha256 = "1fbhnvj0rqc3089ypvgnpkp6ad2rr37v5qk38008dgamb9h7f3qs";
};
nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc gobjectIntrospection ];
buildInputs = [ glib ];
propagatedBuildInputs = [ gtk ];
nativeBuildInputs = [ autoreconfHook pkgconfig gtk_doc ];
buildInputs = [ glib gtk ];
preAutoreconf = ''
gtkdocize

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

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }:
stdenv.mkDerivation rec {
name = "libdrm-2.4.76";
name = "libdrm-2.4.79";
src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "7cdfb83ea77def453299dd95332aa9257c9f3534ff5844f5c0ce87265c275f3a";
sha256 = "c6aaf319293bce38023e9a637471b0f45c93c807d2a279060d741fc7a2e5b197";
};
outputs = [ "out" "dev" ];

4
pkgs/development/libraries/libressl/2.5.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libressl-${version}";
version = "2.5.3";
version = "2.5.1";
src = fetchurl {
url = "mirror://openbsd/LibreSSL/${name}.tar.gz";
sha256 = "0c4awq45cl757fv7f7f75i5i0ibc6v7ns13n7xvfak7chv2lrqql";
sha256 = "1kc709scgd76vk7fld4jnb4wb5lxdv1cj8zsgyjb33xp4jlf06pp";
};
enableParallelBuilding = true;

12
pkgs/development/libraries/libsigsegv/aarch64.patch
View File

@@ -1,12 +0,0 @@
diff --git a/configure b/configure
index 6c4e868..0298e19 100755
--- a/configure
+++ b/configure
@@ -14501,6 +14501,7 @@ else
case "$host_cpu" in
a29k | \
+ aarch64* | \
alpha* | \
arc | \
arm* | strongarm* | xscale* | \

13
pkgs/development/libraries/libsigsegv/default.nix
View File

@@ -1,21 +1,14 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "libsigsegv-2.10";
name = "libsigsegv-2.11";
src = fetchurl {
url = "mirror://gnu/libsigsegv/${name}.tar.gz";
sha256 = "16hrs8k3nmc7a8jam5j1fpspd6sdpkamskvsdpcw6m29vnis8q44";
sha256 = "063swdvq7mbmc1clv0rnh20grwln1zfc2qnm0sa1hivcxyr2wz6x";
};
# Based on https://github.com/davidgfnet/buildroot-Os/blob/69fe6065b9dd1cb4dcc0a4b554e42cc2e5bd0d60/package/libsigsegv/libsigsegv-0002-fix-aarch64-build.patch
# but applied directly to configure since we can't use autoreconf while bootstrapping.
patches = if stdenv.isAarch64 || stdenv.cross.arch or "" == "aarch64"
then [ ./aarch64.patch ]
else null; # TODO: change to lib.optional on next mass rebuild
# https://github.com/NixOS/nixpkgs/issues/6028
doCheck = false;
doCheck = true;
meta = {
homepage = http://www.gnu.org/software/libsigsegv/;

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

@@ -3,11 +3,11 @@
}:
stdenv.mkDerivation rec {
name = "libsndfile-1.0.27";
name = "libsndfile-1.0.28";
src = fetchurl {
url = "http://www.mega-nerd.com/libsndfile/files/${name}.tar.gz";
sha256 = "1h7s61nhf7vklh9sdsbbqzb6x287q4x4j1jc5gmjragl4wprb4d3";
sha256 = "1afzm7jx34jhqn32clc5xghyjglccam2728yxlx37yj2y0lkkwqz";
};
buildInputs = [ pkgconfig flac libogg libvorbis ]

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

@@ -1,11 +1,11 @@
{stdenv, fetchurl}:
stdenv.mkDerivation rec {
name = "lzo-2.09";
name = "lzo-2.10";
src = fetchurl {
url = "${meta.homepage}/download/${name}.tar.gz";
sha256 = "0k5kpj3jnsjfxqqkblpfpx0mqcy86zs5fhjhgh2kq1hksg7ag57j";
sha256 = "0wm04519pd3g8hqpjqhfr72q8qmbiwqaxcs3cndny9h86aa95y60";
};
configureFlags = [ "--enable-shared" ];

2
pkgs/development/libraries/opal/default.nix
View File

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
NIX_CFLAGS_COMPILE = "-D__STDC_CONSTANT_MACROS=1";
NIX_CFLAGS = "-D__STDC_CONSTANT_MACROS=1";
patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ];

1
pkgs/development/libraries/science/math/openblas/default.nix
View File

@@ -98,6 +98,7 @@ stdenv.mkDerivation {
''PREFIX="''$(out)"''
"NUM_THREADS=64"
"INTERFACE64=${if blas64 then "1" else "0"}"
"NO_STATIC=1"
]
++ mapAttrsToList (var: val: var + "=" + val) config;

2
pkgs/development/libraries/science/math/suitesparse/4.2.nix
View File

@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
"LAPACK="
];
NIX_CFLAGS = "-fPIC";
meta = with stdenv.lib; {
homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;
description = "A suite of sparse matrix algorithms";

2
pkgs/development/libraries/science/math/suitesparse/default.nix
View File

@@ -55,7 +55,7 @@ stdenv.mkDerivation {
"LAPACK="
];
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";
NIX_CFLAGS = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";
postInstall = ''
# Build and install shared library

58
pkgs/development/libraries/webkitgtk/2.14.nix
View File

@@ -2,7 +2,7 @@
, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls
, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core
, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit
, libidn, libedit, readline, mesa, libintlOrEmpty
, libidn
, enableGeoLocation ? true, geoclue2, sqlite
, gst-plugins-base
}:
@@ -18,27 +18,12 @@ stdenv.mkDerivation rec {
description = "Web content rendering engine, GTK+ port";
homepage = "http://webkitgtk.org/";
license = licenses.bsd2;
platforms = with platforms; linux ++ darwin;
platforms = platforms.linux;
hydraPlatforms = [];
maintainers = with maintainers; [ ];
};
postConfigure = optionalString stdenv.isDarwin ''
substituteInPlace Source/WebKit2/CMakeFiles/WebKit2.dir/link.txt \
--replace "../../lib/libWTFGTK.a" ""
substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
--replace "../../lib/libbmalloc.a" ""
sed -i "s|[\./]*\.\./lib/lib[^\.]*\.a||g" \
Source/JavaScriptCore/CMakeFiles/LLIntOffsetsExtractor.dir/link.txt \
Source/JavaScriptCore/shell/CMakeFiles/jsc.dir/link.txt \
Source/JavaScriptCore/shell/CMakeFiles/testb3.dir/link.txt \
Source/WebKit2/CMakeFiles/DatabaseProcess.dir/link.txt \
Source/WebKit2/CMakeFiles/NetworkProcess.dir/link.txt \
Source/WebKit2/CMakeFiles/webkit2gtkinjectedbundle.dir/link.txt \
Source/WebKit2/CMakeFiles/WebProcess.dir/link.txt
substituteInPlace Source/JavaScriptCore/CMakeFiles/JavaScriptCore.dir/link.txt \
--replace "../../lib/libWTFGTK.a" "-Wl,-all_load ../../lib/libWTFGTK.a"
'';
preConfigure = "patchShebangs Tools";
src = fetchurl {
url = "http://webkitgtk.org/releases/${name}.tar.xz";
@@ -47,54 +32,29 @@ stdenv.mkDerivation rec {
# see if we can clean this up....
patches = [ ./finding-harfbuzz-icu.patch ]
++ optionals stdenv.isDarwin [
./PR-152650-2.patch
./PR-153138.patch
./PR-157554.patch
./PR-157574.patch
];
patches = [ ./finding-harfbuzz-icu.patch ];
cmakeFlags = [
"-DPORT=GTK"
"-DUSE_LIBHYPHEN=0"
]
++ optional stdenv.isLinux "-DENABLE_GLES2=ON"
++ optionals stdenv.isDarwin [
"-DUSE_SYSTEM_MALLOC=ON"
"-DUSE_ACCELERATE=0"
"-DENABLE_INTROSPECTION=ON"
"-DENABLE_MINIBROWSER=OFF"
"-DENABLE_PLUGIN_PROCESS_GTK2=OFF"
"-DENABLE_MINIBROWSER=OFF"
"-DENABLE_VIDEO=ON"
"-DENABLE_QUARTZ_TARGET=ON"
"-DENABLE_X11_TARGET=OFF"
"-DENABLE_OPENGL=OFF"
"-DENABLE_WEB_AUDIO=OFF"
"-DENABLE_WEBGL=OFF"
"-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
"-DENABLE_GTKDOC=OFF"
"-DENABLE_GLES2=ON"
];
# XXX: WebKit2 missing include path for gst-plugins-base.
# Filled: https://bugs.webkit.org/show_bug.cgi?id=148894
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"
+ (optionalString stdenv.isDarwin " -lintl");
NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0";
nativeBuildInputs = [
cmake perl python2 ruby bison gperf sqlite
pkgconfig gettext gobjectIntrospection
];
buildInputs = libintlOrEmpty ++ [
gtk2 libwebp enchant libnotify gnutls pcre nettle libidn
buildInputs = [
gtk2 wayland libwebp enchant libnotify gnutls pcre nettle libidn
libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11_kit
gst-plugins-base libxkbcommon epoxy at_spi2_core
] ++ optional enableGeoLocation geoclue2
++ (with xlibs; [ libXdmcp libXt libXtst ])
++ optionals stdenv.isDarwin [ libedit readline mesa ]
++ optional stdenv.isLinux wayland;
++ (with xlibs; [ libXdmcp libXt libXtst ]);
propagatedBuildInputs = [
libsoup gtk3

62
pkgs/development/libraries/webkitgtk/PR-152650-2.patch
View File

@@ -1,62 +0,0 @@
From 4607ea0a569b3c527ae8dce341ab55eb0d69d8f7 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Tue, 8 Mar 2016 17:26:23 -0800
Subject: [PATCH 2/2] [GTK][Mac] Enable support for gtk-doc on Mac
https://bugs.webkit.org/show_bug.cgi?id=152650
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
ChangeLog | 10 ++++++++++
Source/PlatformGTK.cmake | 2 +-
Source/cmake/OptionsGTK.cmake | 5 -----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Source/PlatformGTK.cmake b/Source/PlatformGTK.cmake
index af4d2e3..0b11b56 100644
--- a/Source/PlatformGTK.cmake
+++ b/Source/PlatformGTK.cmake
@@ -34,7 +34,7 @@ endmacro()
add_gtkdoc_generator("docs-build.stamp" "")
if (ENABLE_GTKDOC)
add_custom_target(gtkdoc ALL DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
-elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING AND NOT APPLE)
+elseif (NOT ENABLED_COMPILER_SANITIZERS AND NOT CMAKE_CROSSCOMPILING)
add_custom_target(gtkdoc DEPENDS "${CMAKE_BINARY_DIR}/docs-build.stamp")
# Add a default build step which check that documentation does not have any warnings
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index 6b01f1a..b443d10 100644
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -424,11 +424,6 @@ if (CMAKE_CROSSCOMPILING)
set(ENABLE_INTROSPECTION OFF)
endif ()
-# Override the cached variable, gtk-doc does not really work when building on Mac.
-if (APPLE)
- set(ENABLE_GTKDOC OFF)
-endif ()
-
set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
diff --git a/Tools/gtk/gtkdoc.py b/Tools/gtk/gtkdoc.py
index 4c8237b..a628ae0 100644
--- a/Tools/gtk/gtkdoc.py
+++ b/Tools/gtk/gtkdoc.py
@@ -322,6 +322,11 @@ class GTKDoc(object):
env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
else:
env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
+ current_dyld_library_path = env.get('DYLD_LIBRARY_PATH')
+ if current_ld_library_path:
+ env['RUN'] = 'DYLD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_dyld_library_path)
+ else:
+ env['RUN'] = 'DYLD_LIBRARY_PATH="%s" ' % self.library_path
if ldflags:
env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))
--
2.7.2

26
pkgs/development/libraries/webkitgtk/PR-153138.patch
View File

@@ -1,26 +0,0 @@
From 07886d9eacb7587dd52a9bcae10c1fc8ab56a910 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Fri, 15 Jan 2016 11:53:07 -0800
Subject: [PATCH] https://bugs.webkit.org/show_bug.cgi?id=153138
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
Source/JavaScriptCore/bytecode/StructureStubInfo.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
index 1e4b4f5..9b27aed 100644
--- a/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
+++ b/Source/JavaScriptCore/bytecode/StructureStubInfo.cpp
@@ -26,6 +26,8 @@
#include "config.h"
#include "StructureStubInfo.h"
+#include "JSCellInlines.h"
+
#include "JSObject.h"
#include "PolymorphicAccess.h"
#include "Repatch.h"
--
2.7.0

33
pkgs/development/libraries/webkitgtk/PR-157554.patch
View File

@@ -1,33 +0,0 @@
https://bugs.webkit.org/show_bug.cgi?id=157554
--- a/Source/WTF/wtf/OSRandomSource.cpp
+++ b/Source/WTF/wtf/OSRandomSource.cpp
@@ -29,7 +29,7 @@
#include <stdint.h>
#include <stdlib.h>
-#if !OS(DARWIN) && OS(UNIX)
+#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
@@ -46,7 +46,7 @@
namespace WTF {
-#if !OS(DARWIN) && OS(UNIX)
+#if OS(UNIX) && !(OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToOpenURandom()
{
CRASH();
@@ -60,8 +56,8 @@ NEVER_INLINE NO_RETURN_DUE_TO_CRASH static void crashUnableToReadFromURandom()
void cryptographicallyRandomValuesFromOS(unsigned char* buffer, size_t length)
{
-#if OS(DARWIN)
- RELEASE_ASSERT(!CCRandomCopyBytes(kCCRandomDefault, buffer, length));
+#if OS(DARWIN) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+ return arc4random_buf(buffer, length);
#elif OS(UNIX)
int fd = open("/dev/urandom", O_RDONLY, 0);
if (fd < 0)

62
pkgs/development/libraries/webkitgtk/PR-157574.patch
View File

@@ -1,62 +0,0 @@
diff --git a/Source/JavaScriptCore/API/WebKitAvailability.h b/Source/JavaScriptCore/API/WebKitAvailability.h
index ab53183..1310dec 100644
--- a/Source/JavaScriptCore/API/WebKitAvailability.h
+++ b/Source/JavaScriptCore/API/WebKitAvailability.h
@@ -27,57 +27,12 @@
#define __WebKitAvailability__
#if defined(__APPLE__)
-
-#include <AvailabilityMacros.h>
#include <CoreFoundation/CoreFoundation.h>
-
-#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED < 101100
-/* To support availability macros that mention newer OS X versions when building on older OS X versions,
- we provide our own definitions of the underlying macros that the availability macros expand to. We're
- free to expand the macros as no-ops since frameworks built on older OS X versions only ship bundled with
- an application rather than as part of the system.
-*/
-
-#ifndef __NSi_10_10 // Building from trunk rather than SDK.
-#define __NSi_10_10 introduced=10.0 // Use 10.0 to indicate that everything is available.
-#endif
-
-#ifndef __NSi_10_11 // Building from trunk rather than SDK.
-#define __NSi_10_11 introduced=10.0 // Use 10.0 to indicate that everything is available.
-#endif
-
-#ifndef __NSi_10_12 // Building from trunk rather than SDK.
-#define __NSi_10_12 introduced=10.0 // Use 10.0 to indicate that everything is available.
-#endif
-
-#ifndef __AVAILABILITY_INTERNAL__MAC_10_9
-#define __AVAILABILITY_INTERNAL__MAC_10_9
-#endif
-
-#ifndef __AVAILABILITY_INTERNAL__MAC_10_10
-#define __AVAILABILITY_INTERNAL__MAC_10_10
#endif
-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
-#define AVAILABLE_MAC_OS_X_VERSION_10_9_AND_LATER
-#endif
-
-#ifndef AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
-#define AVAILABLE_MAC_OS_X_VERSION_10_10_AND_LATER
-#endif
-
-#endif /* __MAC_OS_X_VERSION_MIN_REQUIRED <= 101100 */
-
-#if defined(BUILDING_GTK__)
#undef CF_AVAILABLE
#define CF_AVAILABLE(_mac, _ios)
#undef CF_ENUM_AVAILABLE
#define CF_ENUM_AVAILABLE(_mac, _ios)
-#endif
-
-#else
-#define CF_AVAILABLE(_mac, _ios)
-#define CF_ENUM_AVAILABLE(_mac, _ios)
-#endif
#endif /* __WebKitAvailability__ */

17
pkgs/development/python-modules/phonenumbers/default.nix
View File

@@ -1,17 +0,0 @@
{ stdenv, fetchurl, buildPythonPackage }:
buildPythonPackage rec {
name = "phonenumbers-8.4.0";
meta = {
description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers";
homepage = "https://github.com/daviddrysdale/python-phonenumbers";
license = stdenv.lib.licenses.asl20;
maintainers = with stdenv.lib.maintainers; [ fadenb ];
};
src = fetchurl {
url = "mirror://pypi/p/phonenumbers/${name}.tar.gz";
sha256 = "1c052gd7ra3v183jq2x5nwa428wxh1g3psfh0ay5jwwmcxy78vab";
};
}

25
pkgs/development/tools/compile-daemon/default.nix
View File

@@ -1,25 +0,0 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
buildGoPackage rec {
name = "compile-daemon-unstable-${version}";
version = "2017-03-08";
rev = "d447e567232bcb84cedd3b2be012c7127f31f469";
goPackagePath = "github.com/githubnemo/CompileDaemon";
src = fetchFromGitHub {
owner = "githubnemo";
repo = "CompileDaemon";
inherit rev;
sha256 = "0jfbipp3gd89n6d7gds1qvfkqvz80qdlqqhijxffh8z8ss0xinqc";
};
goDeps = ./deps.nix;
meta = with stdenv.lib; {
description = "Very simple compile daemon for Go";
license = licenses.bsd2;
maintainers = with maintainers; [ profpatsch ];
inherit (src.meta) homepage;
};
}

48
pkgs/development/tools/compile-daemon/deps.nix
View File

@@ -1,48 +0,0 @@
# This file was generated by https://github.com/kamilchm/go2nix v1.2.0-devel
[
{
goPackagePath = "github.com/fatih/color";
fetch = {
type = "git";
url = "https://github.com/fatih/color";
rev = "9131ab34cf20d2f6d83fdc67168a5430d1c7dc23";
sha256 = "111x6rhpxfjhwkjrmrirqqh6nc68q5g7air9fl5kgr3bg85hybr5";
};
}
{
goPackagePath = "github.com/mattn/go-colorable";
fetch = {
type = "git";
url = "https://github.com/mattn/go-colorable";
rev = "a392f450ea64cee2b268dfaacdc2502b50a22b18";
sha256 = "1msiq5nb1sdhwfjv65hjnvr2s4pfsp8mv6f5z8aa8n9bjf0cksyc";
};
}
{
goPackagePath = "github.com/mattn/go-isatty";
fetch = {
type = "git";
url = "https://github.com/mattn/go-isatty";
rev = "57fdcb988a5c543893cc61bce354a6e24ab70022";
sha256 = "1fkhmi3nhz6vasfvjzjjwxkbpwsb9hzc0g5h1rygqrnzjykl2r39";
};
}
{
goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "99f16d856c9836c42d24e7ab64ea72916925fa97";
sha256 = "0g2x5krfhnraq03v0b48y3xv3ffg92pbgvps0npj9l7wq8q9hkmx";
};
}
{
goPackagePath = "gopkg.in/fsnotify.v1";
fetch = {
type = "git";
url = "https://gopkg.in/fsnotify.v1";
rev = "629574ca2a5df945712d3079857300b5e4da0236";
sha256 = "06wfg1mmzjj04z7d0q1x2fai9k6hm957brngsaf02fa9a3qqanv3";
};
}
]

1
pkgs/development/tools/misc/hydra/default.nix
View File

@@ -55,7 +55,6 @@ let
TextTable
XMLSimple
nixUnstable
nixUnstable.perl-bindings
git
boehmgc
];

36
pkgs/development/tools/pypi2nix/default.nix
View File

@@ -1,24 +1,23 @@
{ stdenv, fetchurl, pythonPackages, zip, makeWrapper, nix, nix-prefetch-git
, nix-prefetch-hg
{ stdenv, fetchurl, python, zip, makeWrapper, nix, nix-prefetch-scripts
}:
let
version = "1.8.0";
version = "1.6.0";
src = fetchurl {
url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz";
sha256 = "133sjx8r1jdb5gi3caawa9m7v496jv4id2c3zqnx8hria22425za";
sha256 = "08iad1ad2gnvsnd66ddw3lff19ms2yly4iq63c8800j603d0pdhn";
};
click = fetchurl {
url = "https://pypi.python.org/packages/95/d9/c3336b6b5711c3ab9d1d3a80f1a3e2afeb9d8c02a7166462f6cc96570897/click-6.7.tar.gz";
sha256 = "02qkfpykbq35id8glfgwc38yc430427yd05z1wc5cnld8zgicmgi";
url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz";
sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
};
requests = fetchurl {
url = "https://pypi.python.org/packages/16/09/37b69de7c924d318e51ece1c4ceb679bf93be9d05973bb30c35babd596e2/requests-2.13.0.tar.gz";
sha256 = "1s0wg4any4dsv5l3hqjxqk2zgb7pdbqhy9rhc8kh3aigfq4ws8jp";
url = "https://pypi.python.org/packages/5b/0b/34be574b1ec997247796e5d516f3a6b6509c4e064f2885a96ed885ce7579/requests-2.12.4.tar.gz";
sha256 = "0d5fwxmw4ibynk3imph3n4n84m0n3ib1vj339fxhkqri0qd4767d";
};
in stdenv.mkDerivation rec {
@@ -28,11 +27,7 @@ in stdenv.mkDerivation rec {
click
requests
];
buildInputs = [
pythonPackages.python pythonPackages.flake8
zip makeWrapper nix.out nix-prefetch-git nix-prefetch-hg
];
buildInputs = [ python zip makeWrapper nix.out nix-prefetch-scripts ];
sourceRoot = ".";
postUnpack = ''
@@ -52,14 +47,13 @@ in stdenv.mkDerivation rec {
patchPhase = ''
sed -i -e "s|default='nix-shell',|default='${nix.out}/bin/nix-shell',|" $out/pkgs/pypi2nix/cli.py
sed -i -e "s|nix-prefetch-git|${nix-prefetch-git}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py
sed -i -e "s|nix-prefetch-hg|${nix-prefetch-hg}/bin/nix-prefetch-hg|" $out/pkgs/pypi2nix/stage2.py
sed -i -e "s|nix-prefetch-git|${nix-prefetch-scripts}/bin/nix-prefetch-git|" $out/pkgs/pypi2nix/stage2.py
'';
commonPhase = ''
mkdir -p $out/bin
echo "#!${pythonPackages.python.interpreter}" > $out/bin/pypi2nix
echo "#!${python.interpreter}" > $out/bin/pypi2nix
echo "import pypi2nix.cli" >> $out/bin/pypi2nix
echo "pypi2nix.cli.main()" >> $out/bin/pypi2nix
@@ -68,16 +62,8 @@ in stdenv.mkDerivation rec {
export PYTHONPATH=$out/pkgs:$PYTHONPATH
'';
# flake8 doesn't run on python3
doCheck = false;
checkPhase = ''
flake8 ${src}/src
'';
installPhase = commonPhase + ''
wrapProgram $out/bin/pypi2nix \
--prefix PYTHONPATH : "$PYTHONPATH" \
--prefix PATH : "${nix-prefetch-git}/bin:${nix-prefetch-hg}/bin"
wrapProgram $out/bin/pypi2nix --prefix PYTHONPATH : "$PYTHONPATH"
'';
shellHook = ''

19
pkgs/development/tools/unity3d/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper, fakeroot, file, getopt
, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr, udev
, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr
, alsaLib, GConf, cups, libcap, fontconfig, freetype, pango
, cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
, libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
@@ -11,7 +11,7 @@ let
libPath64 = lib.makeLibraryPath [
gcc.cc gtk2 gdk_pixbuf glib mesa_glu postgresql nss nspr
alsaLib GConf cups libcap fontconfig freetype pango
cairo dbus expat zlib libpng12 udev
cairo dbus expat zlib libpng12
libX11 libXcursor libXdamage libXfixes libXrender libXi
libXcomposite libXext libXrandr libXtst libSM libICE libxcb
];
@@ -25,16 +25,19 @@ let
gnome-sharp gtk-sharp-2_0
];
ver = "5.5.3";
ver = "5.3.5";
build = "f1";
date = "20160525";
pkgVer = "${ver}${build}";
fullVer = "${pkgVer}+${date}";
in stdenv.mkDerivation rec {
name = "unity-editor-${version}";
version = "${ver}x${build}";
version = pkgVer;
src = fetchurl {
url = "http://beta.unity3d.com/download/a2454d41e248/unity-editor-installer-${version}Linux.sh";
sha256 = "1hvas4n1hm0qp0265gk1nh03kypd9690fnxvzg70f5ni9q97pvm0";
url = "http://download.unity3d.com/download_unity/linux/unity-editor-installer-${fullVer}.sh";
sha256 = "0lmc65175fdvbyn3565pjlg6cc4l5i58fj7bxzi5cqykkbzv5wdm";
};
nosuidLib = ./unity-nosuid.c;
@@ -43,10 +46,9 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "monodevelop" ];
sourceRoot = "unity-editor-${version}Linux";
unpackPhase = ''
echo -e 'q\ny' | fakeroot sh $src
sourceRoot="unity-editor-${pkgVer}"
'';
buildPhase = ''
@@ -123,7 +125,6 @@ in stdenv.mkDerivation rec {
'';
dontStrip = true;
dontPatchELF = true;
meta = with stdenv.lib; {
homepage = https://unity3d.com/;