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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-01-04 21:13:19 +01:00
parent 030f66400d 1a7d28e31f
commit 9618abe87c
99 changed files with 3758 additions and 2213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "actor-framework-${version}";
version = "0.16.2";
version = "0.16.3";
src = fetchFromGitHub {
owner = "actor-framework";
repo = "actor-framework";
rev = "${version}";
sha256 = "0sdr9mrrkrj9nfwqbznz3pkqfsnsi8kanfy99x01js1spqihy1s3";
sha256 = "0nqw1cv7wxbcn2qwm08qffb6k4n3kgvdiaphks5gjgm305jk4vnx";
};
nativeBuildInputs = [ cmake ];

5
pkgs/development/libraries/cutelyst/default.nix
View File

@@ -1,5 +1,6 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, makeWrapper
, qtbase, libuuid, libcap, uwsgi, grantlee }:
, qtbase, libuuid, libcap, uwsgi, grantlee, pcre
}:
stdenv.mkDerivation rec {
name = "cutelyst-${version}";
@@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
buildInputs = [ qtbase libuuid libcap uwsgi grantlee ];
buildInputs = [ qtbase libuuid libcap uwsgi grantlee pcre ];
cmakeFlags = [
"-DPLUGIN_UWSGI=ON"

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

@@ -1,13 +1,13 @@
{ stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
stdenv.mkDerivation rec {
version = "1.17.0";
version = "1.17.2";
name = "grpc-${version}";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
sha256 = "17y8lhkx22qahjk89fa0bh76q76mk9vwza59wbwcpzmy0yhl2k23";
sha256 = "1rq20951h5in3dy0waa60dsqj27kmg6ylp2gdsxyfrq5jarlj89g";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];

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

@@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, gtk2 }:
stdenv.mkDerivation rec {
name = "gtkdatabox-0.9.3.0";
name = "gtkdatabox-0.9.3.1";
src = fetchurl {
url = "mirror://sourceforge/gtkdatabox/${name}.tar.gz";
sha256 = "1wigd4bdlrz4pma2l2wd3z8sx7pqmsvq845nya5vma9ibi96nhhz";
sha256 = "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh";
};
nativeBuildInputs = [ pkgconfig ];

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

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
name = "libcouchbase-${version}";
version = "2.10.2";
version = "2.10.3";
src = fetchFromGitHub {
owner = "couchbase";
repo = "libcouchbase";
rev = version;
sha256 = "1znhy99nhiv21j2jwsx9dsmg8br01wg0hsf1yfwsjny0myv13xkm";
sha256 = "0a3fin5rcwa3xwd980mrzrkr7dpjdwbri81mqwxw1fkppjqw23z4";
};
cmakeFlags = "-DLCB_NO_MOCK=ON";

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

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "libraw-${version}";
version = "0.19.1";
version = "0.19.2";
src = fetchurl {
url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz";
sha256 = "1xjyw4n9gfr2r637pjbpbi3h98h9mdjn61b0hsxwqynq2vdij452";
sha256 = "0i4nhjm5556xgn966x0i503ygk2wafq6z83kg0lisacjjab4f3a0";
};
outputs = [ "out" "lib" "dev" "doc" ];

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

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2
{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2, libgcrypt
, cryptoSupport ? false
, pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
}:
@@ -28,7 +28,9 @@ stdenv.mkDerivation rec {
outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
buildInputs = [ libxml2.dev ] ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ];
buildInputs = [ libxml2.dev ]
++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ]
++ stdenv.lib.optionals cryptoSupport [ libgcrypt ];
propagatedBuildInputs = [ findXMLCatalogs ];