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

Merge branch 'staging.next' into staging.upstream

Browse Source
This commit is contained in:
William A. Kennington III 2015-07-19 02:21:28 -07:00
commit 2ad250f4fa
22 changed files with 1844 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/editors/ed/default.nix
View File

@ -1,14 +1,16 @@
{ fetchurl, stdenv }:
stdenv.mkDerivation rec {
name = "ed-1.10";
name = "ed-1.12";
src = fetchurl {
# gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
#url = "mirror://gnu/ed/${name}.tar.gz";
url = "http://pkgs.fedoraproject.org/repo/extras/ed/${name}.tar.bz2"
+ "/38204d4c690a17a989e802ba01b45e98/${name}.tar.bz2";
sha256 = "16qvshl8470f3znjfrrci3lzllqkzc6disk5kygzsg9hh4f6wysq";
# When updating, please make sure the sources pulled match those upstream by
# Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum`
# in the resulting directory
url = "http://fossies.org/linux/privat/${name}.tar.gz";
sha256 = "111ci6x43bcmylqhrzr32l0q8pplmpb4kiq5pb6cyp0yxkb2dhgj";
};
/* FIXME: Tests currently fail on Darwin:

2
pkgs/development/compilers/llvm/3.6/clang/default.nix
View File

@ -6,7 +6,7 @@ in stdenv.mkDerivation {
name = "clang-${version}";
unpackPhase = ''
unpackFile ${fetch "cfe" "1myssbxlyln0nggfz04nfrbzdckljksmaxp82nq7hrmqjc62vybl"}
unpackFile ${fetch "cfe" "1wwr8s6lzr324hv4s1k6na4j5zv6n9kdhi14s4kb9b13d93814df"}
mv cfe-${version}.src clang
sourceRoot=$PWD/clang
unpackFile ${clang-tools-extra_src}

6
pkgs/development/compilers/llvm/3.6/default.nix
View File

@ -2,7 +2,7 @@
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
version = "3.6.1";
version = "3.6.2";
fetch = fetch_v version;
fetch_v = ver: name: sha256: fetchurl {
@ -10,8 +10,8 @@ let
inherit sha256;
};
compiler-rt_src = fetch "compiler-rt" "17v4gf4y5krgkrd12r95hfxbw5q4c4jlf3513kqlfq5yfw663gzw";
clang-tools-extra_src = fetch "clang-tools-extra" "1dljzdk2jmrwyh8z92rljxl9wzdggp74i9f6g8aajl6mf3c71vpl";
compiler-rt_src = fetch "compiler-rt" "11qx8d3pbfqjaj2x207pvlvzihbs1z2xbw4crpz7aid6h1yz6bqg";
clang-tools-extra_src = fetch "clang-tools-extra" "1ssgs1108gnsggyx9wcl4hmq196f5ix0y1j7ygfh3xcqsckwc3ka";
self = {
llvm = callPackage ./llvm.nix {

2
pkgs/development/compilers/llvm/3.6/libc++/default.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation rec {
name = "libc++-${version}";
src = fetch "libcxx" "1yf0ns4cvvirp1ml5a8h29lysnw5c23715b09x68v5zkxhxnap2s";
src = fetch "libcxx" "10cbgi1nfksjrlgvbsx8pkcqxsgkszdqy5cj2zgwj2c2yi9d9wsj";
# instead of allowing libc++ to link with /usr/lib/libc++abi.dylib,
# force it to link with our copy

2
pkgs/development/compilers/llvm/3.6/libc++abi.nix
View File

@ -3,7 +3,7 @@
stdenv.mkDerivation {
name = "libc++abi-${version}";
src = fetch "libcxxabi" "0pgimy1b5vj4favzdz2830n917fyz65hm3khdgkbgnfs43s8g0xw";
src = fetch "libcxxabi" "16xh54rlnbip4f2bwwbdm1sd6bkqky35jgp7fndnns0llpjqrd3g";
buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) libunwind;

2
pkgs/development/compilers/llvm/3.6/lldb.nix
View File

@ -15,7 +15,7 @@
stdenv.mkDerivation {
name = "lldb-${version}";
src = fetch "lldb" "1fmaz7zcc1f54ns4x8rx9nvhh4pyrhbz103bl02sv1cfwxj5ryyf";
src = fetch "lldb" "1a93cpmlcnpyglgcyfjb3n7c33683wfhwzn36azpv6wicimwj3cl";
patchPhase = ''
sed -i 's|/usr/bin/env||' \

2
pkgs/development/compilers/llvm/3.6/llvm.nix
View File

@ -15,7 +15,7 @@
}:
let
src = fetch "llvm" "0ypwcqrld91jn0zz4mkdksl2mbb0ds9lh5gf0xkbb81sj4awc01g";
src = fetch "llvm" "153vcvj8gvgwakzr4j0kndc0b7wn91c2g1vy2vg24s6spxcc23gn";
in stdenv.mkDerivation rec {
name = "llvm-${version}";

11
pkgs/development/compilers/openjdk/JDK-8074312-hotspot.patch
View File

@ -1,11 +0,0 @@
diff -r 61edd5c7412e make/linux/Makefile
--- a/hotspot/make/linux/Makefile Mon Mar 02 18:12:06 2015 +0000
+++ b/hotspot/make/linux/Makefile Tue Mar 03 15:58:13 2015 +0100
@@ -233,7 +233,7 @@
# Solaris 2.5.1, 2.6).
# Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%
OS_VERSION := $(shell uname -r)
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))

23
pkgs/development/compilers/openjdk/openjdk8.nix
View File

@ -3,42 +3,42 @@
, minimal ? false } :
let
update = "40";
build = "27";
baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u40";
update = "60";
build = "24";
baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
repover = "jdk8u${update}-b${build}";
paxflags = if stdenv.isi686 then "msp" else "m";
jdk8 = fetchurl {
url = "${baseurl}/archive/${repover}.tar.gz";
sha256 = "0ra05jngvvy2g1da5b9anrp86m812g2wlkxpijc82kxv6c3h6g28";
sha256 = "1gxfyz5kdl3xgfmn6gr65hj66zh5p67y1g0hxdbps1h8gcc6iqwp";
};
langtools = fetchurl {
url = "${baseurl}/langtools/archive/${repover}.tar.gz";
sha256 = "0r9zdq13kgqqm8rgr36qf03h23psxcwzvdqffsncd4jvbfap3n5f";
sha256 = "0a8kmfcnw92hvhivmpa9g22k1lvcr64zjw7x1gjj1j6zx7r579ck";
};
hotspot = fetchurl {
url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
sha256 = "07v3z38v5fdsx3g28c4pkdq76cdmnc4qflf1wb3lz46lhy230hkd";
sha256 = "0k68wqwg5fz8i2za9dg2zfx4db5zcbls31vk2abrqrwp31ik0y4y";
};
corba = fetchurl {
url = "${baseurl}/corba/archive/${repover}.tar.gz";
sha256 = "0y20468f2yi14lijbd732f2mlgrn718pyfji3279l2rm4ad7r7pl";
sha256 = "0rc8m5jrwjzrbxnzbhxjm265z23ky6v11g8sgcb6flr0l636fwvn";
};
jdk = fetchurl {
url = "${baseurl}/jdk/archive/${repover}.tar.gz";
sha256 = "1sgfxmkq6z3vj9yq9kszr42b1ijvsknlss353jpcmyr1lljhyvfg";
sha256 = "11c90zz728p30zc6zas9ip67n9sd09i0v6afxs608k9s451057wr";
};
jaxws = fetchurl {
url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
sha256 = "08p3657d0871pz0g5fg157az9q38r5h2zs49dm7512sc9qrn5c06";
sha256 = "15pzczqwrr47qv51bsisjylilhljban8938n1436hsjd5k1dhhwn";
};
jaxp = fetchurl {
url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
sha256 = "1f1vlrvlvnjbyh8d168smizvmkcm076zc496sxk6njqamby16ip2";
sha256 = "0gcc7pb07yl76drcynpz5gjjv3y6s1c0k4kfp9fayha5f624k1fb";
};
nashorn = fetchurl {
url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
sha256 = "1llf3l4483kd8m1a77n7y9fgvm6fa63nim3qhp5z4gnw68ldbhra";
sha256 = "00g849wwqxljqpml6r7rv3pscj0ma0jaamyvxsxlfxbqvwid93ai";
};
openjdk8 = stdenv.mkDerivation {
name = "openjdk-8u${update}b${build}";
@ -66,7 +66,6 @@ let
./fix-java-home-jdk8.patch
./read-truststore-from-env-jdk8.patch
./currency-date-range-jdk8.patch
./JDK-8074312-hotspot.patch
];
preConfigure = ''

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

@ -0,0 +1,40 @@
{ 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;
})

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, libiconv, xz }:
stdenv.mkDerivation (rec {
name = "gettext-0.19.4";
name = "gettext-0.19.5.1";
src = fetchurl {
url = "mirror://gnu/gettext/${name}.tar.gz";
sha256 = "0gvz86m4cs8bdf3mwmwsyx6lrq4ydfxgadrgd9jlx32z3bnz3jca";
sha256 = "0cbp498ckjwj7qr8b9pmkry8hkhldgkvg5yix8hi9c8z1hxxb651";
};
LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";

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

@ -23,7 +23,7 @@ else
*/
let
version = "10.6.1";
version = "10.6.2";
# this is the default search path for DRI drivers
driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
in
@ -37,7 +37,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 = "6c80a2b647e57c85dc36e609d9aed17f878f0d8e0cf9ace86d14cf604101e1eb";
sha256 = "05753d3db4212900927b9894221a1669a10f56786e86a7e818b6e18a0817dca9";
};
prePatch = "patchShebangs .";

29
pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
View File

@ -1,13 +1,28 @@
diff --git a/src/loader/loader.c b/src/loader/loader.c
index 666d015..4d7a9be 100644
index 4fdf3c2..0cd62b5 100644
--- a/src/loader/loader.c
+++ b/src/loader/loader.c
@@ -101,7 +101,7 @@ static void *
@@ -112,7 +112,6 @@ static void *udev_handle = NULL;
static void *
udev_dlopen_handle(void)
{
if (!udev_handle) {
- udev_handle = dlopen("libudev.so.1", RTLD_LOCAL | RTLD_LAZY);
+ udev_handle = dlopen("@udev@/lib/libudev.so.1", RTLD_LOCAL | RTLD_LAZY);
- char name[80];
unsigned flags = RTLD_NOLOAD | RTLD_LOCAL | RTLD_LAZY;
int version;
if (!udev_handle) {
/* libudev.so.1 changed the return types of the two unref functions
@@ -125,12 +124,9 @@ udev_dlopen_handle(void)
/* First try opening an already linked libudev, then try loading one */
do {
- for (version = 1; version >= 0; version--) {
- snprintf(name, sizeof(name), "libudev.so.%d", version);
- udev_handle = dlopen(name, flags);
- if (udev_handle)
- return udev_handle;
- }
+ udev_handle = dlopen("@udev@/lib/libudev.so", flags);
+ if (udev_handle)
+ return udev_handle;
if ((flags & RTLD_NOLOAD) == 0)
break;

15
pkgs/development/libraries/mpfr/default.nix
View File

@ -1,26 +1,19 @@
{ stdenv, fetchurl, gmp }:
stdenv.mkDerivation rec {
name = "mpfr-3.1.2";
name = "mpfr-3.1.3";
src = fetchurl {
url = "mirror://gnu/mpfr/${name}.tar.bz2";
sha256 = "0sqvpfkzamxdr87anzakf9dhkfh15lfmm5bsqajk02h1mxh3zivr";
sha256 = "1z8akfw9wbmq91vrx04bw86mmnxw2sw5qm5cr8ix5b3w2mcv8fzn";
};
patches = [ ./upstream.patch ];
# mpfr.h requires gmp.h
propagatedBuildInputs = [ gmp ];
CFLAGS = "-I${gmp}/include";
LDFLAGS = if stdenv.isDarwin then "-L${gmp}/lib" else null;
configureFlags =
/* Work around a FreeBSD bug that otherwise leads to segfaults in the test suite:
http://hydra.bordeaux.inria.fr/build/34862
http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00015.html
http://www.freebsd.org/cgi/query-pr.cgi?pr=161344
*/
stdenv.lib.optional (stdenv.isSunOS or stdenv.isFreeBSD) "--disable-thread-safe" ++
stdenv.lib.optional stdenv.is64bit "--with-pic";
doCheck = true;

1699
pkgs/development/libraries/mpfr/upstream.patch Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -34,12 +34,12 @@ let
in
stdenv.mkDerivation rec {
name = "${prefix}nghttp2-${version}";
version = "1.0.2";
version = "1.1.1";
# Don't use fetchFromGitHub since this needs a bootstrap curl
src = fetchurl {
url = "http://pub.wak.io/nixos/tarballs/nghttp2-${version}.tar.bz2";
sha256 = "633dd6d5d1f29a4d802d6c9e5b9eeb0b9104f35652396f26999a27515b6c1c14";
sha256 = "9659e8598c8481f1bf8e63ba4f828f5283053df62a51fa8324cb55ea7a51b80c";
};
# Configure script searches for a symbol which does not exist in jemalloc on Darwin

23
pkgs/development/tools/misc/swig/2.x.nix
View File

@ -1,15 +1,28 @@
{ stdenv, fetchurl, pcre }:
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
stdenv.mkDerivation rec {
name = "swig-2.0.11";
name = "swig-${version}";
version = "2.0.12";
src = fetchurl {
url = "mirror://sourceforge/swig/${name}.tar.gz";
sha256 = "0kj21b6syp62vx68r1j6azv9033kng68pxm1k79pm4skkzr0ny33";
src = fetchFromGitHub {
owner = "swig";
repo = "swig";
rev = "rel-${version}";
sha256 = "0khm9gh5pczfcihr0pbicaicc4v9kjm5ip2alvkhmbb3ga6njkcm";
};
nativeBuildInputs = [ autoconf automake libtool bison ];
buildInputs = [ pcre ];
postPatch = ''
# Disable ccache documentation as it need yodl
sed -i '/man1/d' CCache/Makefile.in
'';
preConfigure = ''
./autogen.sh
'';
meta = {
description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";

23
pkgs/development/tools/misc/swig/3.x.nix
View File

@ -1,15 +1,28 @@
{ stdenv, fetchurl, pcre }:
{ stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
stdenv.mkDerivation rec {
name = "swig-3.0.2";
name = "swig-${version}";
version = "3.0.6";
src = fetchurl {
url = "mirror://sourceforge/swig/${name}.tar.gz";
sha256 = "04vqrij3k6pcq41y7rzl5rmhnghqg905f11wyrqw7vdwr9brcrm2";
src = fetchFromGitHub {
owner = "swig";
repo = "swig";
rev = "rel-${version}";
sha256 = "1y8rlrkqs9h5cyp75s1i9rvrj35kkcwjjw65dyv3xy1skgfxb6w8";
};
nativeBuildInputs = [ autoconf automake libtool bison ];
buildInputs = [ pcre ];
postPatch = ''
# Disable ccache documentation as it need yodl
sed -i '/man1/d' CCache/Makefile.in
'';
preConfigure = ''
./autogen.sh
'';
meta = {
description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";

1
pkgs/tools/filesystems/ceph/0.80.nix
View File

@ -12,5 +12,6 @@ callPackage ./generic.nix (args // rec {
patches = [
./0001-Cleanup-boost-optionals.patch
./fix-pgrefdebugging.patch
./boost-158.patch
];
})

5
pkgs/tools/filesystems/ceph/0.94.nix
View File

@ -9,5 +9,8 @@ callPackage ./generic.nix (args // rec {
sha256 = "1nhqzmxv7bz93b8rbd88wgmw9icm2lhmc94dfscgh23kfpipyd6l";
};
patches = [ ./fix-pgrefdebugging.patch ];
patches = [
./fix-pgrefdebugging.patch
./boost-158.patch
];
})

4
pkgs/tools/misc/file/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, zlib }:
stdenv.mkDerivation rec {
name = "file-5.23";
name = "file-5.24";
buildInputs = [ zlib ];
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
"ftp://ftp.astron.com/pub/file/${name}.tar.gz"
"http://distfiles.macports.org/file/${name}.tar.gz"
];
sha256 = "0z0mwqayrrf3w734rjp9rysf0y8az191ff7fxjsxyb1y2kzv72ic";
sha256 = "1kjhqwmi1sjw8jcf6li725c59wm00zajrdfwgkwqxs295vgb6b40";
};
meta = {

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

@ -5718,12 +5718,10 @@ let
strace = callPackage ../development/tools/misc/strace { };
swig = callPackage ../development/tools/misc/swig { };
swig1 = callPackage ../development/tools/misc/swig { };
swig2 = callPackage ../development/tools/misc/swig/2.x.nix { };
swig3 = callPackage ../development/tools/misc/swig/3.x.nix { };
swig = swig3;
swigWithJava = swig;
swfmill = callPackage ../tools/video/swfmill { };
@ -5877,7 +5875,8 @@ let
boost155 = callPackage ../development/libraries/boost/1.55.nix { };
boost156 = callPackage ../development/libraries/boost/1.56.nix { };
boost157 = callPackage ../development/libraries/boost/1.57.nix { };
boost = boost157;
boost158 = callPackage ../development/libraries/boost/1.58.nix { };
boost = boost158;
boost_process = callPackage ../development/libraries/boost-process { };
@ -9304,7 +9303,7 @@ let
perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared
};
apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { swig = swig2; };
apparmor_2_9 = callPackage ../os-specific/linux/apparmor/2.9 { };
libapparmor = apparmor_2_9.libapparmor;
apparmor-pam = apparmor_2_9.apparmor-pam;
apparmor-parser = apparmor_2_9.apparmor-parser;