Skip to content

Commit ed07035

Browse files
vcunatvcunat
committedJun 13, 2017
Merge branch 'staging'
2 parents 156a9af + 4182fc3 commit ed07035

File tree

12 files changed

+39
-48
lines changed

12 files changed

+39
-48
lines changed
 

‎pkgs/development/libraries/at-spi2-atk/default.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
, intltool, dbus_glib, at_spi2_core, libSM }:
33

44
stdenv.mkDerivation rec {
5-
versionMajor = "2.22";
6-
versionMinor = "0";
5+
versionMajor = "2.24";
6+
versionMinor = "1";
77
moduleName = "at-spi2-atk";
88
name = "${moduleName}-${versionMajor}.${versionMinor}";
99

1010
src = fetchurl {
1111
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
12-
sha256 = "e8bdedbeb873eb229eb08c88e11d07713ec25ae175251648ad1a9da6c21113c1";
12+
sha256 = "60dc90ac4f74b8ffe96a9363c25208a443b381bacecfefea6de549f20ed6957d";
1313
};
1414

1515
buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi

‎pkgs/development/libraries/at-spi2-core/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
33

44
stdenv.mkDerivation rec {
5-
versionMajor = "2.22";
5+
versionMajor = "2.24";
66
versionMinor = "1";
77
moduleName = "at-spi2-core";
88
name = "${moduleName}-${versionMajor}.${versionMinor}";
99

1010
src = fetchurl {
1111
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
12-
sha256 = "6f8f39f091bfe2c57870cb8bfbb02edac4fc85cda69665e6967937daf7201c42";
12+
sha256 = "1e90d064b937aacfe79a96232ac7e63d28d716e85bd9ff4333f865305a959b5b";
1313
};
1414

1515
outputs = [ "out" "dev" ];

‎pkgs/development/libraries/gtk+/3.x.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ with stdenv.lib;
1313

1414
let
1515
ver_maj = "3.22";
16-
ver_min = "12";
16+
ver_min = "15";
1717
version = "${ver_maj}.${ver_min}";
1818
in
1919
stdenv.mkDerivation rec {
2020
name = "gtk+3-${version}";
2121

2222
src = fetchurl {
2323
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
24-
sha256 = "84fae0cefb6a11ee2b4e86b8ac42fe46a3d30b4ad16661d5fc51e8ae03e2a98c";
24+
sha256 = "c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb";
2525
};
2626

2727
outputs = [ "out" "dev" ];

‎pkgs/development/libraries/harfbuzz/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
}:
66

77
let
8-
version = "1.4.5";
8+
version = "1.4.6";
99
inherit (stdenv.lib) optional optionals optionalString;
1010
in
1111

@@ -14,7 +14,7 @@ stdenv.mkDerivation {
1414

1515
src = fetchurl {
1616
url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
17-
sha256 = "d0e05438165884f21658154c709075feaf98c93ee5c694b951533ac425a9a711";
17+
sha256 = "21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293";
1818
};
1919

2020
outputs = [ "out" "dev" ];

‎pkgs/development/libraries/libatomic_ops/default.nix

+11-21
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,22 @@
11
{ stdenv, fetchurl, autoconf, automake, libtool }:
2-
let
3-
s = # Generated upstream information
4-
rec {
5-
baseName="libatomic_ops";
6-
version="7.4.4";
7-
name="${baseName}-${version}";
8-
hash="13vg5fqwil17zpf4hj4h8rh3blzmym693lkdjgvwpgni1mh0l8dz";
9-
url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.4.tar.gz";
10-
sha256="13vg5fqwil17zpf4hj4h8rh3blzmym693lkdjgvwpgni1mh0l8dz";
11-
};
12-
13-
buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
142

15-
in stdenv.mkDerivation {
16-
inherit (s) name version;
17-
inherit buildInputs;
3+
stdenv.mkDerivation rec {
4+
name = "libatomic_ops-${version}";
5+
version = "7.6.0";
186

197
src = fetchurl {
20-
inherit (s) url sha256;
8+
url = "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz";
9+
sha256 ="03ylfr29g9zc0r6b6axz3i68alj5qmxgzknxwam3jlx0sz8hcb4f";
2110
};
2211

23-
preConfigure = if stdenv.isCygwin then ''
24-
sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am
25-
./autogen.sh
26-
'' else null;
12+
nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
13+
14+
preConfigure = stdenv.lib.optionalString stdenv.isCygwin ''
15+
sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am
16+
./autogen.sh
17+
'';
2718

2819
meta = {
29-
inherit (s) version;
3020
description = ''A library for semi-portable access to hardware-provided atomic memory update operations'';
3121
license = stdenv.lib.licenses.gpl2Plus ;
3222
maintainers = [stdenv.lib.maintainers.raskin];

‎pkgs/development/libraries/mesa/default.nix

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
, pkgconfig, intltool, autoreconfHook, substituteAll
33
, file, expat, libdrm, xorg, wayland, openssl
44
, llvmPackages, libffi, libomxil-bellagio, libva
5-
, libelf, libvdpau
5+
, libelf, libvdpau, valgrind-light
66
, grsecEnabled ? false
77
, enableRadv ? false
88
# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa.
@@ -67,7 +67,7 @@ let
6767
in
6868

6969
let
70-
version = "17.1.1";
70+
version = "17.1.2";
7171
branch = head (splitString "." version);
7272
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
7373
in
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
8282
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
8383
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
8484
];
85-
sha256 = "aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef";
85+
sha256 = "0937804f43746339b1f9540d8f9c8b4a1bb3d3eec0e4020eac283b8799798239";
8686
};
8787

8888
prePatch = "patchShebangs .";
@@ -152,6 +152,7 @@ stdenv.mkDerivation {
152152
libX11 libXext libxcb libXt libXfixes libxshmfence
153153
libffi wayland libvdpau libelf libXvMC
154154
libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
155+
valgrind-light
155156
];
156157

157158

‎pkgs/development/libraries/pango/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ with stdenv.lib;
66

77
let
88
ver_maj = "1.40";
9-
ver_min = "5";
9+
ver_min = "6";
1010
in
1111
stdenv.mkDerivation rec {
1212
name = "pango-${ver_maj}.${ver_min}";
1313

1414
src = fetchurl {
1515
url = "mirror://gnome/sources/pango/${ver_maj}/${name}.tar.xz";
16-
sha256 = "24748140456c42360b07b2c77a1a2e1216d07c056632079557cd4e815b9d01c9";
16+
sha256 = "ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573";
1717
};
1818

1919
outputs = [ "bin" "dev" "out" "devdoc" ];

‎pkgs/development/tools/build-managers/cmake/default.nix

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{ stdenv, fetchurl, pkgconfig
2-
, bzip2, curl, expat, libarchive, xz, zlib, libuv
2+
, bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
33
# darwin attributes
44
, ps
55
, isBootstrap ? false
@@ -12,7 +12,7 @@ with stdenv.lib;
1212

1313
let
1414
os = stdenv.lib.optionalString;
15-
majorVersion = "3.7";
15+
majorVersion = "3.8";
1616
minorVersion = "2";
1717
version = "${majorVersion}.${minorVersion}";
1818
in
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
2424

2525
src = fetchurl {
2626
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
27-
# from https://cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt
28-
sha256 = "dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0";
27+
# from https://cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt
28+
sha256 = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d";
2929
};
3030

3131
prePatch = optionalString (!useSharedLibraries) ''
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
4444

4545
buildInputs =
4646
[ setupHook pkgconfig ]
47-
++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv ]
47+
++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
4848
++ optional useNcurses ncurses
4949
++ optional useQt4 qt4;
5050

‎pkgs/os-specific/linux/audit/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
assert enablePython -> python != null;
66

77
stdenv.mkDerivation rec {
8-
name = "audit-2.6.6";
8+
name = "audit-2.7.6";
99

1010
src = fetchurl {
1111
url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz";
12-
sha256 = "0jwrww1vn7yqxmb84n6y4p58z34gga0ic4rs2msvpzc2x1hxrn31";
12+
sha256 = "1rqlj15kbyfw4z88z8whf1q2rcg17vs439fvzdds55fwzyf2hrgs";
1313
};
1414

1515
outputs = [ "bin" "dev" "out" "man" "plugins" ];

‎pkgs/servers/x11/xorg/default.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -2254,11 +2254,11 @@ let
22542254
}) // {inherit inputproto libX11 libXaw xproto libXt ;};
22552255

22562256
xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
2257-
name = "xkeyboard-config-2.20";
2257+
name = "xkeyboard-config-2.21";
22582258
builder = ./builder.sh;
22592259
src = fetchurl {
2260-
url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2;
2261-
sha256 = "0d619g4r0w1f6q5qmaqjnsc0956gi02fqgpisqffzqy4acjwggyi";
2260+
url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2;
2261+
sha256 = "1iffxpchy6dfgbby23nfsqqk17h9lfddlmjnhwagqag1z94p1h9h";
22622262
};
22632263
buildInputs = [pkgconfig libX11 xproto ];
22642264
meta.platforms = stdenv.lib.platforms.unix;

‎pkgs/servers/x11/xorg/tarballs-7.7.list

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2
177177
mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2
178178
mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2
179179
mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2
180-
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2
180+
mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2
181181
mirror://xorg/individual/app/xkill-1.0.4.tar.bz2
182182
mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2
183183
mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2

‎pkgs/tools/misc/file/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
stdenv.mkDerivation rec {
44
name = "file-${version}";
5-
version = "5.30";
5+
version = "5.31";
66

77
src = fetchurl {
88
urls = [
99
"ftp://ftp.astron.com/pub/file/${name}.tar.gz"
1010
"https://distfiles.macports.org/file/${name}.tar.gz"
1111
];
12-
sha256 = "694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214";
12+
sha256 = "1vp4zihaxkhi85chkjgd4r4zdg4k2wa3c6pmajhbmx6gr7d8ii89";
1313
};
1414

1515
buildInputs = [ zlib ];

0 commit comments

Comments
 (0)
Please sign in to comment.