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-06-13 11:22:56 +02:00
commit ed070354a9
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
12 changed files with 39 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/at-spi2-atk/default.nix
View File

@ -2,14 +2,14 @@
, intltool, dbus_glib, at_spi2_core, libSM }: , intltool, dbus_glib, at_spi2_core, libSM }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
versionMajor = "2.22"; versionMajor = "2.24";
versionMinor = "0"; versionMinor = "1";
moduleName = "at-spi2-atk"; moduleName = "at-spi2-atk";
name = "${moduleName}-${versionMajor}.${versionMinor}"; name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "e8bdedbeb873eb229eb08c88e11d07713ec25ae175251648ad1a9da6c21113c1"; sha256 = "60dc90ac4f74b8ffe96a9363c25208a443b381bacecfefea6de549f20ed6957d";
}; };
buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi buildInputs = [ python pkgconfig popt atk libX11 libICE xorg.libXtst libXi

4
pkgs/development/libraries/at-spi2-core/default.nix
View File

@ -2,14 +2,14 @@
, libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }: , libX11, xextproto, libSM, libICE, libXtst, libXi, gobjectIntrospection }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
versionMajor = "2.22"; versionMajor = "2.24";
versionMinor = "1"; versionMinor = "1";
moduleName = "at-spi2-core"; moduleName = "at-spi2-core";
name = "${moduleName}-${versionMajor}.${versionMinor}"; name = "${moduleName}-${versionMajor}.${versionMinor}";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
sha256 = "6f8f39f091bfe2c57870cb8bfbb02edac4fc85cda69665e6967937daf7201c42"; sha256 = "1e90d064b937aacfe79a96232ac7e63d28d716e85bd9ff4333f865305a959b5b";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

4
pkgs/development/libraries/gtk+/3.x.nix
View File

@ -13,7 +13,7 @@ with stdenv.lib;
let let
ver_maj = "3.22"; ver_maj = "3.22";
ver_min = "12"; ver_min = "15";
version = "${ver_maj}.${ver_min}"; version = "${ver_maj}.${ver_min}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
sha256 = "84fae0cefb6a11ee2b4e86b8ac42fe46a3d30b4ad16661d5fc51e8ae03e2a98c"; sha256 = "c8a012c2a99132629ab043f764a2b7cb6388483a015cd15c7a4288bec3590fdb";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

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

@ -5,7 +5,7 @@
}: }:
let let
version = "1.4.5"; version = "1.4.6";
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 = "d0e05438165884f21658154c709075feaf98c93ee5c694b951533ac425a9a711"; sha256 = "21a78b81cd20cbffdb04b59ac7edfb410e42141869f637ae1d6778e74928d293";
}; };
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];

32
pkgs/development/libraries/libatomic_ops/default.nix
View File

@ -1,32 +1,22 @@
{ stdenv, fetchurl, autoconf, automake, libtool }: { stdenv, fetchurl, autoconf, automake, libtool }:
let
s = # Generated upstream information
rec {
baseName="libatomic_ops";
version="7.4.4";
name="${baseName}-${version}";
hash="13vg5fqwil17zpf4hj4h8rh3blzmym693lkdjgvwpgni1mh0l8dz";
url="http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.4.4.tar.gz";
sha256="13vg5fqwil17zpf4hj4h8rh3blzmym693lkdjgvwpgni1mh0l8dz";
};
buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
in stdenv.mkDerivation { stdenv.mkDerivation rec {
inherit (s) name version; name = "libatomic_ops-${version}";
inherit buildInputs; version = "7.6.0";
src = fetchurl { src = fetchurl {
inherit (s) url sha256; url = "http://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-${version}.tar.gz";
sha256 ="03ylfr29g9zc0r6b6axz3i68alj5qmxgzknxwam3jlx0sz8hcb4f";
}; };
preConfigure = if stdenv.isCygwin then '' nativeBuildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake libtool ];
sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am
./autogen.sh preConfigure = stdenv.lib.optionalString stdenv.isCygwin ''
'' else null; sed -i -e "/libatomic_ops_gpl_la_SOURCES/a libatomic_ops_gpl_la_LIBADD = libatomic_ops.la" src/Makefile.am
./autogen.sh
'';
meta = { meta = {
inherit (s) version;
description = ''A library for semi-portable access to hardware-provided atomic memory update operations''; description = ''A library for semi-portable access to hardware-provided atomic memory update operations'';
license = stdenv.lib.licenses.gpl2Plus ; license = stdenv.lib.licenses.gpl2Plus ;
maintainers = [stdenv.lib.maintainers.raskin]; maintainers = [stdenv.lib.maintainers.raskin];

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

@ -2,7 +2,7 @@
, pkgconfig, intltool, autoreconfHook, substituteAll , pkgconfig, intltool, autoreconfHook, substituteAll
, file, expat, libdrm, xorg, wayland, openssl , file, expat, libdrm, xorg, wayland, openssl
, llvmPackages, libffi, libomxil-bellagio, libva , llvmPackages, libffi, libomxil-bellagio, libva
, libelf, libvdpau , libelf, libvdpau, valgrind-light
, grsecEnabled ? false , grsecEnabled ? false
, enableRadv ? false , enableRadv ? false
# Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa. # Texture floats are patented, see docs/patents.txt, so we don't enable them for full Mesa.
@ -67,7 +67,7 @@ let
in in
let let
version = "17.1.1"; version = "17.1.2";
branch = head (splitString "." version); branch = head (splitString "." version);
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
in in
@ -82,7 +82,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz" "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
]; ];
sha256 = "aed503f94c0c1630a162a3e276f4ee12a86764cee4cb92338ea2dea99a04e7ef"; sha256 = "0937804f43746339b1f9540d8f9c8b4a1bb3d3eec0e4020eac283b8799798239";
}; };
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";
@ -152,6 +152,7 @@ stdenv.mkDerivation {
libX11 libXext libxcb libXt libXfixes libxshmfence libX11 libXext libxcb libXt libXfixes libxshmfence
libffi wayland libvdpau libelf libXvMC libffi wayland libvdpau libelf libXvMC
libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/ libomxil-bellagio libva libpthreadstubs openssl/*or another sha1 provider*/
valgrind-light
]; ];

4
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 = "5"; ver_min = "6";
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 = "24748140456c42360b07b2c77a1a2e1216d07c056632079557cd4e815b9d01c9"; sha256 = "ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573";
}; };
outputs = [ "bin" "dev" "out" "devdoc" ]; outputs = [ "bin" "dev" "out" "devdoc" ];

10
pkgs/development/tools/build-managers/cmake/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, bzip2, curl, expat, libarchive, xz, zlib, libuv , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
# darwin attributes # darwin attributes
, ps , ps
, isBootstrap ? false , isBootstrap ? false
@ -12,7 +12,7 @@ with stdenv.lib;
let let
os = stdenv.lib.optionalString; os = stdenv.lib.optionalString;
majorVersion = "3.7"; majorVersion = "3.8";
minorVersion = "2"; minorVersion = "2";
version = "${majorVersion}.${minorVersion}"; version = "${majorVersion}.${minorVersion}";
in in
@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz"; url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
# from https://cmake.org/files/v3.7/cmake-3.7.2-SHA-256.txt # from https://cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt
sha256 = "dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0"; sha256 = "da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d";
}; };
prePatch = optionalString (!useSharedLibraries) '' prePatch = optionalString (!useSharedLibraries) ''
@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ setupHook pkgconfig ] [ setupHook pkgconfig ]
++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv ] ++ optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ]
++ optional useNcurses ncurses ++ optional useNcurses ncurses
++ optional useQt4 qt4; ++ optional useQt4 qt4;

4
pkgs/os-specific/linux/audit/default.nix
View File

@ -5,11 +5,11 @@
assert enablePython -> python != null; assert enablePython -> python != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "audit-2.6.6"; name = "audit-2.7.6";
src = fetchurl { src = fetchurl {
url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz"; url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz";
sha256 = "0jwrww1vn7yqxmb84n6y4p58z34gga0ic4rs2msvpzc2x1hxrn31"; sha256 = "1rqlj15kbyfw4z88z8whf1q2rcg17vs439fvzdds55fwzyf2hrgs";
}; };
outputs = [ "bin" "dev" "out" "man" "plugins" ]; outputs = [ "bin" "dev" "out" "man" "plugins" ];

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

@ -2254,11 +2254,11 @@ let
}) // {inherit inputproto libX11 libXaw xproto libXt ;}; }) // {inherit inputproto libX11 libXaw xproto libXt ;};
xkeyboardconfig = (mkDerivation "xkeyboardconfig" { xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
name = "xkeyboard-config-2.20"; name = "xkeyboard-config-2.21";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.20.tar.bz2; url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.tar.bz2;
sha256 = "0d619g4r0w1f6q5qmaqjnsc0956gi02fqgpisqffzqy4acjwggyi"; sha256 = "1iffxpchy6dfgbby23nfsqqk17h9lfddlmjnhwagqag1z94p1h9h";
}; };
buildInputs = [pkgconfig libX11 xproto ]; buildInputs = [pkgconfig libX11 xproto ];
meta.platforms = stdenv.lib.platforms.unix; meta.platforms = stdenv.lib.platforms.unix;

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

@ -177,7 +177,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2
mirror://xorg/individual/app/xkbcomp-1.4.0.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.4.0.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.20.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.21.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

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

@ -2,14 +2,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "file-${version}"; name = "file-${version}";
version = "5.30"; version = "5.31";
src = fetchurl { src = fetchurl {
urls = [ urls = [
"ftp://ftp.astron.com/pub/file/${name}.tar.gz" "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
"https://distfiles.macports.org/file/${name}.tar.gz" "https://distfiles.macports.org/file/${name}.tar.gz"
]; ];
sha256 = "694c2432e5240187524c9e7cf1ec6acc77b47a0e19554d34c14773e43dbbf214"; sha256 = "1vp4zihaxkhi85chkjgd4r4zdg4k2wa3c6pmajhbmx6gr7d8ii89";
}; };
buildInputs = [ zlib ]; buildInputs = [ zlib ];