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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-07-28 09:10:03 +02:00
parent cc79535f6f f441d3e3a5
commit cca5ee9c07
86 changed files with 1431 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,12 +3,12 @@
stdenv.mkDerivation rec {
name = "liburing-${version}";
version = "1.0.0pre150_${builtins.substring 0 7 src.rev}";
version = "1.0.0pre156_${builtins.substring 0 7 src.rev}";
src = fetchgit {
url = "http://git.kernel.dk/liburing";
rev = "93f3e8d511e53133a4367afe04b5f256073082a0";
sha256 = "14ndx3z0q6gynkmlwiah6775ss0p1xmjgn428gqgbsganiyhkwgp";
rev = "c31c7ec4bcd7bb0d7b28897d730431c02b9d4ea1";
sha256 = "17d6s03fyajcrijca9d2d6llbf8cl8dyalpxnl39az3452p04s11";
};
separateDebugInfo = true;

27
pkgs/development/libraries/opencv/3.x.nix
View File

@@ -35,20 +35,20 @@
}:
let
version = "3.4.6";
version = "3.4.7";
src = fetchFromGitHub {
owner = "opencv";
repo = "opencv";
rev = version;
sha256 = "1gf0rbgd5s13q46bdna0bqn4yz9rxfhvlhbp5ds9hs326q8zprg8";
sha256 = "0r5rrcnqx2lsnr1ja5ij2chb7yk9kkamr4p0ik52sqxydwkv3z50";
};
contribSrc = fetchFromGitHub {
owner = "opencv";
repo = "opencv_contrib";
rev = version;
sha256 = "115qcq0k2wmvhxw5lyv14yrd8m6xq3qy0pdby90ml2yl1caymbfy";
sha256 = "1ik6acsmgrx66awf19r2y3ijqvv9xg43gaphwszbiyi0jq3r43yw";
};
# Contrib must be built in order to enable Tesseract support:
@@ -61,16 +61,16 @@ let
src = fetchFromGitHub {
owner = "opencv";
repo = "opencv_3rdparty";
rev = "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a";
sha256 = "1ys9mshfpm8iy8h4ml792gnqrq959dsrcv26axx14niivxyjbji8";
rev = "32e315a5b106a7b89dbed51c28f8120a48b368b4";
sha256 = "19w9f0r16072s59diqxsr5q6nmwyz9gnxjs49nglzhd66p3ddbkp";
} + "/ippicv";
files = let name = platform : "ippicv_2017u3_${platform}_general_20180518.tgz"; in
files = let name = platform : "ippicv_2019_${platform}_general_20180723.tgz"; in
if stdenv.hostPlatform.system == "x86_64-linux" then
{ ${name "lnx_intel64"} = "b7cc351267db2d34b9efa1cd22ff0572"; }
{ ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; }
else if stdenv.hostPlatform.system == "i686-linux" then
{ ${name "lnx_ia32"} = "ea72de74dae3c604eb6348395366e78e"; }
{ ${name "lnx_ia32"} = "4f38432c30bfd6423164b7a24bbc98a0"; }
else if stdenv.hostPlatform.system == "x86_64-darwin" then
{ ${name "mac_intel64"} = "3ae52b9be0fe73dd45bc5e9429cd3732"; }
{ ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; }
else
throw "ICV is not available for this platform (or not yet supported by this package)";
dst = ".cache/ippicv";
@@ -147,12 +147,6 @@ stdenv.mkDerivation rec {
cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
'';
patches = lib.optional stdenv.isDarwin
(fetchpatch {
url = "https://github.com/opencv/opencv/commit/7621b91769098359e893e68ad474040ca7940fa1.patch";
sha256 = "12qb14yd5934ig61lzs4pg29gak9wjyhnj7nmfx5r213jj1a4m21";
});
# This prevents cmake from using libraries in impure paths (which
# causes build failure on non NixOS)
# Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with
@@ -246,6 +240,9 @@ stdenv.mkDerivation rec {
"-DBUILD_opencv_videoio=OFF"
] ++ lib.optionals enablePython [
"-DOPENCV_SKIP_PYTHON_LOADER=ON"
] ++ lib.optional enableEigen [
# Autodetection broken by https://github.com/opencv/opencv/pull/13337
"-DEIGEN_INCLUDE_PATH=${eigen}/include/eigen3"
];
enableParallelBuilding = true;

1
pkgs/development/libraries/openjpeg/1.x.nix
View File

@@ -5,4 +5,5 @@ callPackage ./generic.nix (args // rec {
branch = "1.5";
revision = "version.1.5.2";
sha256 = "1dvvpvb597i5z8srz2v4c5dsbxb966h125jx3m2z0r2gd2wvpfkp";
testsSupport = false;
})

12
pkgs/development/libraries/openscenegraph/default.nix
View File

@@ -26,14 +26,14 @@
}:
stdenv.mkDerivation rec {
name = "openscenegraph-${version}";
version = "3.6.3";
pname = "openscenegraph";
version = "3.6.4";
src = fetchFromGitHub {
owner = "openscenegraph";
repo = "OpenSceneGraph";
rev = "d011ca4e8d83549a3688bf6bb8cd468dd9684822";
sha256 = "0h32z15sa8sbq276j0iib0n707m8bs4p5ji9z2ah411446paad9q";
rev = "OpenSceneGraph-${version}";
sha256 = "0x8hdbzw0b71j91fzp9cwmy9a7ava8v8wwyj8nxijq942vdx1785";
};
nativeBuildInputs = [ pkgconfig cmake doxygen ];
@@ -64,14 +64,12 @@ stdenv.mkDerivation rec {
++ lib.optionals withExamples [ fltk wxGTK ]
;
enableParallelBuilding = true;
cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF" ++ lib.optional withExamples "-DBUILD_OSG_EXAMPLES=ON";
meta = with stdenv.lib; {
description = "A 3D graphics toolkit";
homepage = http://www.openscenegraph.org/;
maintainers = [ maintainers.raskin ];
maintainers = with maintainers; [ aanderse raskin ];
platforms = platforms.linux;
license = "OpenSceneGraph Public License - free LGPL-based license";
};

39
pkgs/development/libraries/wlc/default.nix
View File

@@ -1,39 +0,0 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
, wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL
, libX11, dbus, wayland-protocols, libdrm, mesa
, libpthreadstubs, libXdmcp, libXext, libXfixes
, withOptionalPackages ? true, zlib, valgrind, doxygen
}:
stdenv.mkDerivation rec {
name = "wlc-${version}";
version = "0.0.11";
src = fetchFromGitHub {
owner = "Cloudef";
repo = "wlc";
rev = "v${version}";
fetchSubmodules = true;
sha256 = "1qnak907gjd35hq4b0rrhgb7kz5iwnirh8yk372yzxpgk7dq0gz9";
};
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [
wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL
libX11 libXfixes dbus wayland-protocols
libpthreadstubs libXdmcp libXext libdrm mesa ]
++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ];
doCheck = true;
checkTarget = "test";
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A library for making a simple Wayland compositor";
homepage = https://github.com/Cloudef/wlc;
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ primeos ]; # Trying to keep it up-to-date.
};
}