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-12-19 10:27:13 +01:00
parent b4551924b1 69345ec37b
commit 4a2340ff6b
68 changed files with 1043 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/boost/1.65.nix
View File

@@ -9,4 +9,6 @@ callPackage ./generic.nix (args // rec {
sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81";
};
enableNumpy = true;
})

4
pkgs/development/libraries/boost/generic.nix
View File

@@ -10,7 +10,7 @@
, enablePIC ? false
, enableExceptions ? false
, enablePython ? hostPlatform == buildPlatform
, enableNumpy ? false, numpy ? null
, enableNumpy ? false
, taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
, patches ? null
, mpi ? null
@@ -156,7 +156,7 @@ stdenv.mkDerivation {
++ optional (hostPlatform == buildPlatform) icu
++ optional stdenv.isDarwin fixDarwinDylibNames
++ optional enablePython python
++ optional enableNumpy numpy;
++ optional enableNumpy python.pkgs.numpy;
configureScript = "./bootstrap.sh";
configureFlags = commonConfigureFlags

18
pkgs/development/libraries/fribidi/default.nix
View File

@@ -1,22 +1,26 @@
{stdenv, fetchurl}:
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
stdenv.mkDerivation rec {
name = "fribidi-${version}";
version = "0.19.7";
src = fetchurl {
url = "http://fribidi.org/download/${name}.tar.bz2";
sha256 = "13jsb5qadlhsaxkbrb49nqslmbh904vvzhsm5mm2ghmv29i2l8h8";
src = fetchFromGitHub {
owner = "fribidi";
repo = "fribidi";
rev = version;
sha256 = "10q5jfch5qzrj2w4fbkr086ank66plx8hp7ra9a01irj80pbk96d";
};
hardeningDisable = [ "format" ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
# Configure script checks for glib, but it is only used for tests.
outputs = [ "out" "devdoc" ];
meta = with stdenv.lib; {
homepage = http://fribidi.org/;
homepage = https://github.com/fribidi/fribidi;
description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)";
license = licenses.gpl2;
license = licenses.lgpl21;
platforms = platforms.unix;
};
}

4
pkgs/development/libraries/gstreamer/vaapi/default.nix
View File

@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "gst-vaapi-${version}";
version = "1.12.3";
version = "1.12.4";
src = fetchurl {
url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz";
sha256 = "0kbl2c4zv004qwhm9mc0jlhz2pc3dqrng2vwj68a81lnzpcazkgl";
sha256 = "1jg9nvc8000yi2bcl3wn2yh2hwl7yvlwldj6778w8c0z5qj7fb8w";
};
outputs = [ "out" "dev" ];

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

@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "libbfd-${version}";
inherit (binutils-raw) version src;
inherit (binutils-raw.bintools) version src;
outputs = [ "out" "dev" ];
patches = binutils-raw.patches ++ [
patches = binutils-raw.bintools.patches ++ [
../../tools/misc/binutils/build-components-separately.patch
];

4
pkgs/development/libraries/libjpeg-turbo/default.nix
View File

@@ -4,11 +4,11 @@
stdenv.mkDerivation rec {
name = "libjpeg-turbo-${version}";
version = "1.5.2";
version = "1.5.3";
src = fetchurl {
url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz";
sha256 = "0a5m0psfp5952y5vrcs0nbdz1y9wqzg2ms0xwrx752034wxr964h";
sha256 = "08r5b5mywwrxv4axvq80dm31cklz81grczlzlxr2xqa6pgi90j5j";
}; # github releases still need autotools, surprisingly
patches =

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

@@ -5,11 +5,11 @@
stdenv.mkDerivation rec {
name = "libopcodes-${version}";
inherit (binutils-raw) version src;
inherit (binutils-raw.bintools) version src;
outputs = [ "out" "dev" ];
patches = binutils-raw.patches ++ [
patches = binutils-raw.bintools.patches ++ [
../../tools/misc/binutils/build-components-separately.patch
];

2
pkgs/development/libraries/libstdc++5/default.nix
View File

@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
# being generated to make sure that they use our glibc.
EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-cflags) -O2"
extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"
extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_BINTOOLS/nix-support/libc-ldflags) $(cat $NIX_BINTOOLS/nix-support/libc-ldflags-before)"
for i in $extraLDFlags; do
EXTRA_FLAGS="$EXTRA_FLAGS -Wl,$i"
done

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

@@ -2,14 +2,14 @@
, ApplicationServices, CoreServices }:
stdenv.mkDerivation rec {
version = "1.16.1";
version = "1.18.0";
name = "libuv-${version}";
src = fetchFromGitHub {
owner = "libuv";
repo = "libuv";
rev = "v${version}";
sha256 = "06p3xy276spqbr9xzbs7qlpdk34qsn87s2qmp6xn4j7v3bnqja7z";
sha256 = "0s71c2y4ll3vp463hsdk74q4hr7wprkxc2a4agw3za2hhzcb95pd";
};
postPatch = let

29
pkgs/development/libraries/libva-utils/default.nix Normal file
View File

@@ -0,0 +1,29 @@
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig
, libdrm, libva
}:
stdenv.mkDerivation rec {
name = "libva-utils-${version}";
inherit (libva) version;
src = fetchFromGitHub {
owner = "01org";
repo = "libva-utils";
rev = version;
sha256 = "02n51cvp8bzzjk4fargwvgh7z71y8spg24hqgaawbp3p3ahh7xxi";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libdrm libva ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "VAAPI tools: Video Acceleration API";
homepage = http://www.freedesktop.org/wiki/Software/vaapi;
license = licenses.mit;
maintainers = with maintainers; [ garbas ];
platforms = platforms.unix;
};
}

35
pkgs/development/libraries/libva/default.nix
View File

@@ -1,36 +1,43 @@
{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig
, libXext, libdrm, libXfixes, wayland, libffi, libX11
, mesa_noglu
, minimal ? true, libva
}:
stdenv.mkDerivation rec {
name = "libva-${version}";
version = "1.7.3";
name = "libva-${lib.optionalString (!minimal) "full-"}${version}";
version = "2.0.0";
src = fetchurl {
url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
sha256 = "1ndrf136rlw03xag7j1xpmf9015d1h0dpnv6v587jnh6k2a17g12";
src = fetchFromGitHub {
owner = "01org";
repo = "libva";
rev = version;
sha256 = "1x8rlmv5wfqjz3j87byrxb4d9vp5b4lrrin2fx254nwl3aqy15hy";
};
outputs = [ "bin" "dev" "out" ];
outputs = [ "dev" "out" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libdrm ]
++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ];
# TODO: share libs between minimal and !minimal - perhaps just symlink them
configureFlags =
[ "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" ] ++
lib.optionals (!minimal) [ "--enable-glx" ];
enableParallelBuilding = true;
installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ];
configureFlags = [
"--with-drivers-path=${mesa_noglu.driverLink}/lib/dri"
] ++ lib.optionals (!minimal) [ "--enable-glx" ];
installFlags = [
"dummy_drv_video_ladir=$(out)/lib/dri"
];
meta = with stdenv.lib; {
description = "VAAPI library: Video Acceleration API";
homepage = http://www.freedesktop.org/wiki/Software/vaapi;
license = licenses.mit;
description = "VAAPI library: Video Acceleration API";
platforms = platforms.unix;
maintainers = with maintainers; [ garbas ];
platforms = platforms.unix;
};
}

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

@@ -66,7 +66,7 @@ let
in
let
version = "17.2.6";
version = "17.2.7";
branch = head (splitString "." version);
driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
in
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
"https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
];
sha256 = "1pihiymglf3bf6w2vphac65v64hv71wgrj38mckbwc03c8j55n3a";
sha256 = "0s3slgjxnx482yw0knn4a6alsy2cq28rah6hnjbmf12mvyldxksh";
};
prePatch = "patchShebangs .";

16
pkgs/development/libraries/vaapi-intel/default.nix
View File

@@ -1,14 +1,16 @@
{ stdenv, fetchurl, gnum4, pkgconfig, python2
{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2
, intel-gpu-tools, libdrm, libva, libX11, mesa_noglu, wayland, libXext
}:
stdenv.mkDerivation rec {
name = "intel-vaapi-driver-${version}";
version = "1.8.2";
inherit (libva) version;
src = fetchurl {
url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2";
sha256 = "00mpcvininwr5c4wyhp16s4bddg7vclxxjm2sfq5h7lifjcxyv46";
src = fetchFromGitHub {
owner = "01org";
repo = "libva-intel-driver";
rev = version;
sha256 = "1832nnva3d33wv52bj59bv62q7a807sdxjqqq0my7l9x7a4qdkzz";
};
patchPhase = ''
@@ -25,10 +27,12 @@ stdenv.mkDerivation rec {
"--enable-wayland"
];
nativeBuildInputs = [ gnum4 pkgconfig python2 ];
nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ];
buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext mesa_noglu wayland ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = http://cgit.freedesktop.org/vaapi/intel-driver/;
license = licenses.mit;