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

Merge branch 'staging'

Browse Source
This commit is contained in:
Vladimír Čunát 2016-12-04 19:22:36 +01:00
commit ad0d7f6a05
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
16 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/window-managers/i3/gaps.nix
View File

@ -17,6 +17,8 @@ i3.overrideDerivation (super : rec {
echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION echo -n "${version} (${releaseDate})" > ./i3-${version}/I3_VERSION
''; '';
# fatal error: GENERATED_config_enums.h: No such file or directory
enableParallelBuilding = false;
}) // { }) // {
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/development/interpreters/guile/default.nix
View File

@ -61,8 +61,8 @@
''; '';
# make check doesn't work on darwin # make check doesn't work on darwin
# On i686-linux we got some error that doesn't always appear. # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
doCheck = !stdenv.isDarwin && (stdenv.system != "i686-linux"); doCheck = false;
setupHook = ./setup-hook-2.0.sh; setupHook = ./setup-hook-2.0.sh;

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }: { stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }:
let let
ver_maj = "2.20"; ver_maj = "2.22";
ver_min = "0"; ver_min = "0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz"; url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz";
sha256 = "493a50f6c4a025f588d380a551ec277e070b28a82e63ef8e3c06b3ee7c1238f0"; sha256 = "d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = [ glib gobjectIntrospection /*ToDo: why propagate*/ ]; propagatedBuildInputs = [ glib gobjectIntrospection /*ToDo: why propagate*/ ];
#doCheck = true; # no checks in there (2.10.0) #doCheck = true; # no checks in there (2.22.0)
meta = { meta = {
description = "Accessibility toolkit"; description = "Accessibility toolkit";

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

@ -7,7 +7,9 @@ stdenv.mkDerivation rec {
name = "cairomm-${ver_maj}.${ver_min}"; name = "cairomm-${ver_maj}.${ver_min}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz"; url = "http://www.cairographics.org/releases/${name}.tar.gz";
# gnome doesn't have the latest version ATM
#url = "mirror://gnome/sources/cairomm/${ver_maj}/${name}.tar.xz";
sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6"; sha256 = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6";
}; };

4
pkgs/development/libraries/dbus-glib/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }: { stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dbus-glib-0.106"; name = "dbus-glib-0.108";
src = fetchurl { src = fetchurl {
url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz"; url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
sha256 = "0in0i6v68ixcy0ip28i84hdczf10ykq9x682qgcvls6gdmq552dk"; sha256 = "0b307hw9j41npzr6niw1bs6ryp87m5yafg492gqwvsaj4dz0qd4z";
}; };
outputs = [ "out" "dev" "devdoc" ]; outputs = [ "out" "dev" "devdoc" ];

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

@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
&& libSM != null; && libSM != null;
let let
version = "1.10.12"; version = "1.10.14";
sha256 = "0pa71vf5c0d7k3gni06iascmplj0j5g70wbc833ayvi71d1pj2i1"; sha256 = "10x0wvv2ly4lyyfd42k4xw0ar5qdbi9cksw3l5fcwf1y6mq8y8r3";
self = stdenv.mkDerivation { self = stdenv.mkDerivation {
name = "dbus-${version}"; name = "dbus-${version}";

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

@ -43,7 +43,7 @@ let
''; '';
ver_maj = "2.50"; ver_maj = "2.50";
ver_min = "1"; ver_min = "2";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
sha256 = "2ef87a78f37c1eb5b95f4cc95efd5b66f69afad9c9c0899918d04659cf6df7dd"; sha256 = "be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5";
}; };
patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;

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

@ -5,7 +5,7 @@
}: }:
let let
version = "1.3.2"; version = "1.3.3";
inherit (stdenv.lib) optional optionals optionalString; inherit (stdenv.lib) optional optionals optionalString;
in in
@ -14,7 +14,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
sha256 = "09z0ki9w76v0bh4rdkds7zsb7vf721iaiyidcdy9ii885wvschw5"; sha256 = "2620987115a4122b47321610dccbcc18f7f121115fd7b88dc8a695c8b66cb3c9";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

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

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }: { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libdrm-2.4.73"; name = "libdrm-2.4.74";
src = fetchurl { src = fetchurl {
url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
sha256 = "0kayvwqqrjm45y6dk9q2b4gmjdasci0y28jzv4bq05py8a9d7gwn"; sha256 = "d80dd5a76c401f4c8756dcccd999c63d7e0a3bad258d96a829055cfd86ef840b";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

7
pkgs/development/libraries/libjpeg-turbo/default.nix
View File

@ -1,12 +1,13 @@
{ stdenv, fetchurl, nasm }: { stdenv, fetchurl, nasm }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libjpeg-turbo-1.5.0"; name = "libjpeg-turbo-${version}";
version = "1.5.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
sha256 = "0pq3lav976d6a1d16yyqrj1b4gmhk1ca4zar6zp00avxlqqpqfcz"; sha256 = "0v365hm6z6lddcqagjj15wflk66rqyw75m73cqzl65rh4lyrshj1";
}; }; # github releases still need autotools, surprisingly
patches = patches =
stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt") stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt")

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

@ -1,11 +1,11 @@
{ fetchurl, stdenv, libiconv }: { fetchurl, stdenv, libiconv }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libunistring-0.9.6"; name = "libunistring-0.9.7";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/libunistring/${name}.tar.gz"; url = "mirror://gnu/libunistring/${name}.tar.gz";
sha256 = "0ixxmgpgh2v8ifm6hbwsjxl023myk3dfnj7wnvmqjivza31fw9cn"; sha256 = "1ra1baz2187kbw9im47g6kqb5mx9plq703mkjxaval8rxv5q3q4w";
}; };
patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ]; patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ];

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

@ -6,14 +6,14 @@ with stdenv.lib;
let let
ver_maj = "1.40"; ver_maj = "1.40";
ver_min = "2"; ver_min = "3";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pango-${ver_maj}.${ver_min}"; name = "pango-${ver_maj}.${ver_min}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz"; url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
sha256 = "90582a02bc89318d205814fc097f2e9dd164d26da5f27c53ea42d583b34c3cd1"; sha256 = "abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3";
}; };
outputs = [ "bin" "dev" "out" "devdoc" ]; outputs = [ "bin" "dev" "out" "devdoc" ];
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
doCheck = false; # test-layout fails on 1.38.0 doCheck = false; # test-layout fails on 1.40.3 (fails to find font config)
# jww (2014-05-05): The tests currently fail on Darwin: # jww (2014-05-05): The tests currently fail on Darwin:
# #
# ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0) # ERROR:testiter.c:139:iter_char_test: assertion failed: (extents.width == x1 - x0)

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

@ -8,8 +8,8 @@
}: }:
let # beware: updates often break cups-filters build let # beware: updates often break cups-filters build
version = "0.47.0"; # even major numbers are stable version = "0.49.0";
sha256 = "0hnjkcqqk87dw3hlda4gh4l7brkslniax9a79g772jn3iwiffwmq"; sha256 = "17x7nc6c0bk4s95nzq4i1qzbl419p76c40pwkksdvp233q75yj0l";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "poppler-${suffix}-${version}"; name = "poppler-${suffix}-${version}";

18
pkgs/servers/x11/xorg/default.nix
View File

@ -790,11 +790,11 @@ let
}) // {inherit fixesproto libX11 xextproto xproto ;}; }) // {inherit fixesproto libX11 xextproto xproto ;};
libXfont = (mkDerivation "libXfont" { libXfont = (mkDerivation "libXfont" {
name = "libXfont-1.5.1"; name = "libXfont-1.5.2";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2; url = mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2;
sha256 = "1630v3sfvwwlimb2ja10c84ql6v1mw9bdfhvan7pbybkgi99h25p"; sha256 = "0w8d07bkmjiarkx09579bl8zsq903mn8javc7qpi0ix4ink5x502";
}; };
buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ]; buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
@ -2243,11 +2243,11 @@ let
}) // {inherit inputproto libX11 libXaw xproto libXt ;}; }) // {inherit inputproto libX11 libXaw xproto libXt ;};
xkeyboardconfig = (mkDerivation "xkeyboardconfig" { xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
name = "xkeyboard-config-2.18"; name = "xkeyboard-config-2.19";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.bz2; url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.19.tar.bz2;
sha256 = "1l6x2w357ja8vm94ns79s7yj9a5dlr01r9dxrjvzwncadiyr27f4"; sha256 = "09sqyi430bbg13pp8j0j60p9p9xn2lpqx38xw1lyv77bp63d3pw3";
}; };
buildInputs = [pkgconfig libX11 xproto ]; buildInputs = [pkgconfig libX11 xproto ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;
@ -2397,11 +2397,11 @@ let
}) // {inherit libX11 xproto ;}; }) // {inherit libX11 xproto ;};
xproto = (mkDerivation "xproto" { xproto = (mkDerivation "xproto" {
name = "xproto-7.0.29"; name = "xproto-7.0.31";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/proto/xproto-7.0.29.tar.bz2; url = mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2;
sha256 = "12lzpa9mrzkyrhrphzpi1014np3328qg7mdq08wj6wyaj9q4f6kc"; sha256 = "0ivpxz0rx2a7nahkpkhfgymz7j0pwzaqvyqpdgw9afmxl1yp9yf6";
}; };
buildInputs = [pkgconfig ]; buildInputs = [pkgconfig ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;

6
pkgs/servers/x11/xorg/tarballs-7.7.list
View File

@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2
mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2 mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2
mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.2.tar.bz2
mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2
mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2 mirror://xorg/individual/lib/libXi-1.7.8.tar.bz2
@ -175,7 +175,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2
mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2
mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.19.tar.bz2
mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2
mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2
mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
@ -187,7 +187,7 @@ mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2
mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2
mirror://xorg/individual/proto/xproto-7.0.29.tar.bz2 mirror://xorg/individual/proto/xproto-7.0.31.tar.bz2
mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2 mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2
mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2 mirror://xorg/individual/app/xrdb-1.1.0.tar.bz2
mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2 mirror://xorg/individual/app/xrefresh-1.0.5.tar.bz2

4
pkgs/tools/system/pciutils/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, zlib, kmod, which }: { stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pciutils-3.5.1"; # with database from 2016-05 name = "pciutils-3.5.2"; # with database from 2016-10
src = fetchurl { src = fetchurl {
url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz"; url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz";
sha256 = "0byl2f897w5lhs4bvr6p7qwcz9bllj2zyfv7nywbcbsnb9ha9wrb"; sha256 = "1z2y4f3cyvm7a0dyan0n6jpb3p9pvh35lrim0058slj0kwd1969s";
}; };
patches = [ ./module-dir.diff ]; patches = [ ./module-dir.diff ];