alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'staging'

Browse source
This commit is contained in:
Vladimír Čunát 2014-12-26 22:41:19 +01:00
parent dd4dfee2c2 d89518bd1b
commit becf038336
17 changed files with 46 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/compilers/gcc/4.8/bug-61801.patch
View file

@ -1,15 +0,0 @@
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61801
https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=212740
--- a/gcc/sched-deps.c 2014/07/17 07:48:49 212739
+++ b/gcc/sched-deps.c 2014/07/17 07:49:44 212740
@@ -2744,7 +2744,8 @@
Consider for instance a volatile asm that changes the fpu rounding
mode. An insn should not be moved across this even if it only uses
pseudo-regs because it might give an incorrectly rounded result. */
- if (code != ASM_OPERANDS || MEM_VOLATILE_P (x))
+ if ((code != ASM_OPERANDS || MEM_VOLATILE_P (x))
+ && !DEBUG_INSN_P (insn))
reg_pending_barrier = TRUE_BARRIER;
/* For all ASM_OPERANDS, we must traverse the vector of input operands.

6
pkgs/development/compilers/gcc/4.8/default.nix
View file

@ -54,14 +54,14 @@ assert langGo -> langCC;
with stdenv.lib;
with builtins;
let version = "4.8.3";
let version = "4.8.4";
# Whether building a cross-compiler for GNU/Hurd.
crossGNU = cross != null && cross.config == "i586-pc-gnu";
enableParallelBuilding = true;
patches = [ ./bug-61801.patch ]
patches = [ ]
++ optional enableParallelBuilding ./parallel-bconfig.patch
++ optional (cross != null) ./libstdc++-target.patch
++ optional noSysDirs ./no-sys-dirs.patch
@ -209,7 +209,7 @@ stdenv.mkDerivation ({
src = fetchurl {
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
sha256 = "07hg10zs7gnqz58my10ch0zygizqh0z0bz6pv4pgxx45n48lz3ka";
sha256 = "15c6gwm6dzsaagamxkak5smdkf1rdfbqqjs9jdbrp3lbg4ism02a";
};
inherit patches;

4
pkgs/development/compilers/orc/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "orc-0.4.22";
name = "orc-0.4.23";
src = fetchurl {
url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.xz";
sha256 = "0dgrbjm94y9l63s3srlddjcdxgrv6iazmvwh630jrw159dzhgjh4";
sha256 = "1ryz1gfgrxcj806cakcblxf0bcwq8p2mw8k86fs3f5wlwayawzkn";
};
# building memcpy_speed.log

4
pkgs/development/libraries/gstreamer/bad/default.nix
View file

@ -11,7 +11,7 @@
assert faacSupport -> faac != null;
stdenv.mkDerivation rec {
name = "gst-plugins-bad-1.4.3";
name = "gst-plugins-bad-1.4.5";
meta = with stdenv.lib; {
description = "Gstreamer Bad Plugins";
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz";
sha256 = "a6840080c469d0db51d6d4d0f7c42c97b3c8c01942f24401c61b1ad36726b97c";
sha256 = "0g4q9yqq71z32pz7zj54wigkcf438a2mcv5kvvwp4gb8a1rasbqm";
};
nativeBuildInputs = [ pkgconfig python ];

4
pkgs/development/libraries/gstreamer/base/default.nix
View file

@ -4,7 +4,7 @@
}:
stdenv.mkDerivation rec {
name = "gst-plugins-base-1.4.3";
name = "gst-plugins-base-1.4.5";
meta = {
description = "Base plugins and helper libraries";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz";
sha256 = "f7b4d2b3ba2bcac485896e2c1c36459cb091ebe8b49e91635c27d40f66792d9d";
sha256 = "07ampnfa6p41s0lhia62l9h8bdx3c7vxvdz93pbx64m3wycq3gbp";
};
nativeBuildInputs = [

4
pkgs/development/libraries/gstreamer/core/default.nix
View file

@ -3,7 +3,7 @@
}:
stdenv.mkDerivation rec {
name = "gstreamer-1.4.3";
name = "gstreamer-1.4.5";
meta = {
description = "Open source multimedia framework";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gstreamer/${name}.tar.xz";
sha256 = "11f155784d28b85a12b50d2fc8f91c6b75d9ca325cc76aaffba1a58d4c9549c9";
sha256 = "1bmhbhak6i5wmmb6w86jyyv8lax4gdq983la4lk4a0krz6kim020";
};
nativeBuildInputs = [

4
pkgs/development/libraries/gstreamer/good/default.nix
View file

@ -7,7 +7,7 @@
}:
stdenv.mkDerivation rec {
name = "gst-plugins-good-1.4.3";
name = "gst-plugins-good-1.4.5";
meta = with stdenv.lib; {
description = "Gstreamer Good Plugins";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz";
sha256 = "5876a74402f2a24d1d3ae9163c32466bdc7a565696dddeef65e6a9a93efc5537";
sha256 = "0hg6qzdpib9nwn3hdxv0d4rvivi1c4bmxsq2a9hqmamwyzrvbcbr";
};
nativeBuildInputs = [ pkgconfig python ];

4
pkgs/development/libraries/gstreamer/libav/default.nix
View file

@ -6,7 +6,7 @@
assert withSystemLibav -> libav != null;
stdenv.mkDerivation rec {
name = "gst-libav-1.4.3";
name = "gst-libav-1.4.5";
meta = {
homepage = "http://gstreamer.freedesktop.org";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-libav/${name}.tar.xz";
sha256 = "833229d2b1aad6549ad0297435516508cc3ac47b166d6393ecdffc34c31a01d3";
sha256 = "1g7vg9amh3cc3nmc415h6g2rqxqi4wgwqi08hxfbpwq48ri64p30";
};
configureFlags = stdenv.lib.optionalString withSystemLibav

4
pkgs/development/libraries/gstreamer/ugly/default.nix
View file

@ -5,7 +5,7 @@
}:
stdenv.mkDerivation rec {
name = "gst-plugins-ugly-1.4.3";
name = "gst-plugins-ugly-1.4.5";
meta = with stdenv.lib; {
description = "Gstreamer Ugly Plugins";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz";
sha256 = "d581592a82cf3930361430d38436c30a58d8b6c249cad18f7f213b203e206d46";
sha256 = "0rwhljn3f8mp2pfchzfcx4pvps1546dndw9mr56lz50qyqffimaw";
};
nativeBuildInputs = [ pkgconfig python ];

6
pkgs/development/libraries/libpng/default.nix
View file

@ -3,11 +3,11 @@
assert zlib != null;
let
version = "1.6.14";
sha256 = "0i5lwh9xnqj490c3mcx7rxaq4zr3wj27ba7vzfls45aqa2jl714n";
version = "1.6.16";
sha256 = "0q5ygy15jkpqbj5701ywrjzqp4nl5yz3r4g58h2p0kiycggm9xs2";
patch_src = fetchurl {
url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
sha256 = "1gwpm9kb57dknicy9j4mf8g9q5zz4ikhbznlk32jhw2b3l0mn446";
sha256 = "1sf27a5gvwvcm4wsf2pyq87d3g4l2fym8cirq9sli54bi753ikbh";
};
whenPatched = stdenv.lib.optionalString apngSupport;

10
pkgs/development/libraries/libvdpau/default.nix
View file

@ -1,22 +1,24 @@
{ stdenv, fetchurl, pkgconfig, xorg }:
stdenv.mkDerivation rec {
name = "libvdpau-0.8";
name = "libvdpau-0.9";
src = fetchurl {
url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
sha256 = "1v81875hppablq9gpsmvhnyl7z80zihx6arry758pvdbq4fd39vk";
sha256 = "0vhfkjqghfva3zjif04w7pdp84g08c8xnwir3ah4b99m10a5fag3";
};
buildInputs = with xorg; [ pkgconfig dri2proto libXext ];
propagatedBuildInputs = [ xorg.libX11 ];
configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64" ];
configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64";
meta = with stdenv.lib; {
homepage = http://people.freedesktop.org/~aplattner/vdpau/;
description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)";
license = licenses.mit;
license = licenses.mit; # expat version
platforms = platforms.unix;
maintainers = [ maintainers.vcunat ];
};
}

6
pkgs/os-specific/linux/uclibc/default.nix
View file

@ -48,12 +48,12 @@ let
in
stdenv.mkDerivation {
name = "uclibc-0.9.34-pre-20141029" + stdenv.lib.optionalString (cross != null)
name = "uclibc-0.9.34-pre-20141215" + stdenv.lib.optionalString (cross != null)
("-" + cross.config);
src = fetchurl {
url = http://www.uclibc.org/downloads/snapshots/uClibc-20141029.tar.bz2;
sha256 = "018r3bhw1jyyihmm5xxq1psl3r5yx02a57p8qxvay3vvzxn2cvzm";
url = http://www.uclibc.org/downloads/snapshots/uClibc-20141215.tar.bz2;
sha256 = "07d1fmnc2yapfhhadr5c8q7591xqxxqmiicmcgcn8sqmaxppzp5f";
};
# 'ftw' needed to build acl, a coreutils dependency

4
pkgs/os-specific/linux/util-linux/default.nix
View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
stdenv.mkDerivation rec {
name = "util-linux-2.25.1";
name = "util-linux-2.25.2";
src = fetchurl {
url = "mirror://kernel/linux/utils/util-linux/v2.25/${name}.tar.xz";
sha256 = "4701305ae22790c3a92ce48e50794fa05b7ee01f4227f419a171c100d08986e8";
sha256 = "e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6";
};
crossAttrs = {

8
pkgs/stdenv/linux/bootstrap/i686.nix
View file

@ -1,12 +1,12 @@
{
busybox = import <nix/fetchurl.nix> {
url = http://tarballs.nixos.org/stdenv-linux/i686/73b75f6157db79fc899154a497823e82e409e76d/busybox;
sha256 = "159208615405938d9830634f15d38adf5a9c33643926845c44499dbe6dd62042";
url = http://tarballs.nixos.org/stdenv-linux/i686/8d66a51a872af1ab58edc68a2ebddcc79958b563/busybox;
sha256 = "9278001d11bb0359d0cc1b30bd5c9823f0b9c65db127d6dfcc1f6bbc000d15a0";
executable = true;
};
bootstrapTools = import <nix/fetchurl.nix> {
url = http://tarballs.nixos.org/stdenv-linux/i686/73b75f6157db79fc899154a497823e82e409e76d/bootstrap-tools.tar.xz;
sha256 = "68c430b84dbeac0bd1bea4cdd3159dce44a76445e07860caed1972b4608c42ca";
url = http://tarballs.nixos.org/stdenv-linux/i686/8d66a51a872af1ab58edc68a2ebddcc79958b563/bootstrap-tools.tar.xz;
sha256 = "6bc27ce9b08adcca0298f5fe80fe67f5bbb2dffdd1d8666fd44cb76ace198a25";
};
}

4
pkgs/stdenv/linux/bootstrap/x86_64.nix
View file

@ -3,7 +3,7 @@
{
bootstrapTools = import <nix/fetchurl.nix> {
url = http://tarballs.nixos.org/stdenv-linux/x86_64/73b75f6157db79fc899154a497823e82e409e76d/bootstrap-tools.tar.xz;
sha256 = "e29d47a5dc9f1ff10c3fbaacbd03a3cca0c784299df09fcdd9e25797ec6414ad";
url = http://tarballs.nixos.org/stdenv-linux/x86_64/8d66a51a872af1ab58edc68a2ebddcc79958b563/bootstrap-tools.tar.xz;
sha256 = "325230b74d3d98f62ddcb595543887d09cd8421745a4eda229d2a87a1f1ed336";
};
}

2
pkgs/stdenv/linux/make-bootstrap-tools.nix
View file

@ -52,6 +52,8 @@ rec {
cp -d ${glibc}/lib/libpthread*.so* $out/lib
cp -d ${glibc}/lib/libnsl*.so* $out/lib
cp -d ${glibc}/lib/libutil*.so* $out/lib
cp -d ${glibc}/lib/libnss*.so* $out/lib
cp -d ${glibc}/lib/libresolv*.so* $out/lib
cp -d ${glibc}/lib/crt?.o $out/lib
cp -rL ${glibc}/include $out

12
pkgs/tools/X11/vdpauinfo/default.nix
View file

@ -1,18 +1,20 @@
{ stdenv, fetchurl, pkgconfig, xlibs, libvdpau }:
stdenv.mkDerivation rec {
name = "vdpauinfo-0.1";
name = "vdpauinfo-0.9";
src = fetchurl {
url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
sha256 = "17q1spsrd5i4jzhpacbs0bb4blf74j8s45rpg0znyc1yjfk5dj5h";
sha256 = "1qy84clsz3l3hvhaxw01rl4bjqlsaml5l63rc43vck6vh8vgwh50";
};
buildInputs = [ pkgconfig xlibs.libX11 libvdpau ];
buildInputs = [ pkgconfig libvdpau ];
meta = {
meta = with stdenv.lib; {
homepage = http://people.freedesktop.org/~aplattner/vdpau/;
description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system";
license = "bsd";
license = licenses.mit; # expat version
platforms = platforms.unix;
maintainers = [ maintainers.vcunat ];
};
}