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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2019-12-30 05:24:03 +01:00
parent 5aed91512d 480fc1856a
commit a69e309794
97 changed files with 971 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/ffmpeg/3.4.nix
+2 -2
View File
@@ -6,7 +6,7 @@
callPackage ./generic.nix (rec {
version = branch;
branch = "3.4.6";
sha256 = "1s20wzgxxrm56gckyb8cf1lh36hdnkdxvmmnnvdxvia4zb3grf1b";
branch = "3.4.7";
sha256 = "0hj91gjps92f4w3yyqss89yrs6s75574hbj5gz9g5affd6294yhc";
darwinFrameworks = [ Cocoa CoreMedia ];
} // args)
pkgs/development/libraries/gdcm/default.nix
+5 -5
View File
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
cd ../build
'';
cmakeFlags = ''
-DGDCM_BUILD_APPLICATIONS=ON
-DGDCM_BUILD_SHARED_LIBS=ON
-DGDCM_USE_VTK=ON
'';
cmakeFlags = [
"-DGDCM_BUILD_APPLICATIONS=ON"
"-DGDCM_BUILD_SHARED_LIBS=ON"
"-DGDCM_USE_VTK=ON"
];
enableParallelBuilding = true;
buildInputs = [ cmake vtk ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices darwin.apple_sdk.frameworks.Cocoa ];
pkgs/development/libraries/gegl/4.0.nix
+6
View File
@@ -57,6 +57,12 @@ stdenv.mkDerivation rec {
url = "https://gitlab.gnome.org/GNOME/gegl/commit/2bc06bfedee4fb25f6a966c8235b75292e24e55f.patch";
sha256 = "1psls61wsrdq5pzpvj22mrm46lpzrw3wkx6li7dv6fyb65wz2n4d";
})
# Fix test timeout. Downstream debian patch.
(fetchpatch {
url = "https://salsa.debian.org/gnome-team/gegl/raw/9b7520b38d87cd8ad4b39bf0b8c62d011da25169/debian/patches/increase_test_timeout.patch";
sha256 = "1prc1h1aipjd9db0i1j7nzga4zvk3vl8qsjpz1jzv1wwvz02isly";
})
];
nativeBuildInputs = [
pkgs/development/libraries/grpc/default.nix
+4 -4
View File
@@ -1,20 +1,20 @@
{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
stdenv.mkDerivation rec {
version = "1.25.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
version = "1.26.0"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too
pname = "grpc";
src = fetchFromGitHub {
owner = "grpc";
repo = "grpc";
rev = "v${version}";
sha256 = "02nbmbk1xpibjzvbhi8xpazmwry46ki24vks1sh2p0aqwy4hv6yb";
sha256 = "1fxydarl00vbhd9q153qn4ax1yc6xrd8wij6bfy9j8chipw1bgir";
fetchSubmodules = true;
};
patches = [
# Fix build on armv6l (https://github.com/grpc/grpc/pull/21341)
(fetchpatch {
url = "https://github.com/grpc/grpc/commit/ffb8a278389c8e3403b23a9897b65a7390c34645.patch";
sha256 = "1lc12a3gccg9wxqhnwgldlj3zmlm6lxg8dssvvj1x7hf655kw3w3";
url = "https://github.com/grpc/grpc/commit/198d221e775cf73455eeb863672e7a6274d217f1.patch";
sha256 = "11k35w6ffvl192rgzzj2hzyzjhizdgk7i56zdkx6v60zxnyfn7yq";
})
];
pkgs/development/libraries/gtk-layer-shell/default.nix
+40
View File
@@ -0,0 +1,40 @@
{ stdenv
, fetchFromGitHub
, meson
, ninja
, pkgconfig
, wayland
, gtk3
, gobject-introspection
}:
stdenv.mkDerivation rec {
pname = "gtk-layer-shell";
version = "0.1.0";
src = fetchFromGitHub {
owner = "wmww";
repo = "gtk-layer-shell";
rev = "v${version}";
sha256 = "1fwvlbwp5w1zly6mksvlzbx18ikq4bh7pdj9q0k94qlj6x2zdwg8";
};
nativeBuildInputs = [
meson ninja pkgconfig
];
buildInputs = [
wayland gtk3 gobject-introspection
];
mesonFlags = [
"-Dout=${placeholder "out"}"
];
meta = with stdenv.lib; {
description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol";
license = licenses.mit;
maintainers = with maintainers; [ eonpatapon ];
platforms = platforms.unix;
};
}
pkgs/development/libraries/libdbusmenu-qt/default.nix
+1 -1
View File
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
buildInputs = [ qt4 ];
nativeBuildInputs = [ cmake ];
cmakeFlags = "-DWITH_DOC=OFF";
cmakeFlags = [ "-DWITH_DOC=OFF" ];
meta = with stdenv.lib; {
description = "Provides a Qt implementation of the DBusMenu spec";
pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
buildInputs = [ qtbase ];
nativeBuildInputs = [ cmake ];
cmakeFlags = "-DWITH_DOC=OFF";
cmakeFlags = [ "-DWITH_DOC=OFF" ];
meta = with stdenv.lib; {
homepage = https://launchpad.net/libdbusmenu-qt;
pkgs/development/libraries/libnabo/default.nix
+3 -3
View File
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
cmakeFlags = "
-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3
";
cmakeFlags = [
"-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3"
];
doCheck = true;
checkTarget = "test";
pkgs/development/libraries/libpointmatcher/default.nix
+3 -3
View File
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
cmakeFlags = "
-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3
";
cmakeFlags = [
"-DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3"
];
doCheck = true;
checkPhase = ''
pkgs/development/libraries/libtcod/default.nix
+1 -1
View File
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
echo 'INSTALL(DIRECTORY include DESTINATION .)' >> CMakeLists.txt
'';
cmakeFlags="-DLIBTCOD_SAMPLES=OFF";
cmakeFlags = [ "-DLIBTCOD_SAMPLES=OFF" ];
buildInputs = [ cmake SDL libGLU libGL upx zlib ];
pkgs/development/libraries/phonon/backends/gstreamer.nix
-4
View File
@@ -52,10 +52,6 @@ stdenv.mkDerivation rec {
qtx11extras
];
# cleanup: the build system creates (empty) $out/$out/share/icons (double prefix)
# if DESTDIR is unset
DESTDIR="/";
nativeBuildInputs = [
cmake
pkgconfig
pkgs/development/libraries/tbb/default.nix
+2 -4
View File
@@ -11,10 +11,8 @@ with stdenv.lib; stdenv.mkDerivation rec {
sha256 = "1a39nflw7b2n51jfp3fdprnkpgzaspzww1dckfvaigflfli9s8rj";
};
makeFlags = concatStringsSep " " (
optional (compiler != null) "compiler=${compiler}" ++
optional (stdver != null) "stdver=${stdver}"
);
makeFlags = optional (compiler != null) "compiler=${compiler}"
++ optional (stdver != null) "stdver=${stdver}";
patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./glibc-struct-mallinfo.patch;