Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2018-08-26 12:09:22 +02:00
95 changed files with 2446 additions and 1934 deletions

View File

@@ -0,0 +1,59 @@
{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }:
let
jce-policies = fetchurl {
# Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK!
url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip";
sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0";
};
jdk = stdenv.mkDerivation {
name = "zulu10.1+11-jdk10";
src = fetchurl {
url = "https://cdn.azul.com/zulu/bin/zulu10.1+11-jdk10-macosx_x64.zip";
sha256 = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y";
curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
};
buildInputs = [ unzip freetype ];
installPhase = ''
mkdir -p $out
mv * $out
unzip ${jce-policies}
mv -f ZuluJCEPolicies/*.jar $out/lib/security/
# jni.h expects jni_md.h to be in the header search path.
ln -s $out/include/darwin/*_md.h $out/include/
if [ -f $out/LICENSE ]; then
install -D $out/LICENSE $out/share/zulu/LICENSE
rm $out/LICENSE
fi
'';
preFixup = ''
# Propagate the setJavaClassPath setup hook from the JRE so that
# any package that depends on the JRE has $CLASSPATH set up
# properly.
mkdir -p $out/nix-support
printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/lib/libfontmanager.dylib
# Set JAVA_HOME automatically.
cat <<EOF >> $out/nix-support/setup-hook
if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi
EOF
'';
passthru = {
jre = jdk;
home = jdk;
};
meta.platforms = stdenv.lib.platforms.darwin;
};
in jdk

View File

@@ -0,0 +1,24 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, libdrm, libva }:
stdenv.mkDerivation rec {
name = "cmrt-${version}";
version = "1.0.6";
src = fetchurl {
url = "https://github.com/intel/cmrt/archive/${version}.tar.gz";
sha256 = "1q7651nvvcqhph5rgfhklm71zqd0c405mrh3wx0cfzvil82yj8na";
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ libdrm libva ];
meta = with stdenv.lib; {
homepage = https://01.org/linuxmedia;
description = "Intel C for Media Runtime";
longDescription = "Media GPU kernel manager for Intel G45 & HD Graphics family";
license = licenses.mit;
maintainers = with maintainers; [ tadfisher ];
platforms = platforms.linux;
};
}

View File

@@ -173,6 +173,7 @@ let
kxmlgui = callPackage ./kxmlgui.nix {};
kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
plasma-framework = callPackage ./plasma-framework.nix {};
kpurpose = callPackage ./purpose.nix {};
# TIER 4
frameworkintegration = callPackage ./frameworkintegration.nix {};

View File

@@ -0,0 +1,14 @@
{
mkDerivation, lib, extra-cmake-modules, qtbase
, qtdeclarative, kconfig, kcoreaddons, ki18n, kio
}:
mkDerivation {
name = "purpose";
meta = { maintainers = [ lib.maintainers.bkchr ]; };
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
qtbase qtdeclarative kconfig kcoreaddons
ki18n kio
];
}

View File

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, glib, zlib, libpng, gnumake3, cmake }:
stdenv.mkDerivation rec {
version = "0.3.2";
version = "0.3.95";
name = "lensfun-${version}";
src = fetchurl {
url = "mirror://sourceforge/lensfun/${version}/${name}.tar.gz";
sha256 = "0cfk8jjhs9nbfjfdy98plrj9ayi59aph0nx6ppslgjhlcvacm2xf";
sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2";
};
nativeBuildInputs = [ pkgconfig ];

View File

@@ -0,0 +1,39 @@
{ stdenv, fetchurl, pkgconfig, vala, gobjectIntrospection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }:
let
version = "0.7.0";
pname = "libgrss";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
outputs = [ "out" "dev" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7";
};
nativeBuildInputs = [ pkgconfig vala gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_412 ];
buildInputs = [ glib libxml2 libsoup ];
configureFlags = [
"--enable-gtk-doc"
];
doCheck = true;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with stdenv.lib; {
description = "Glib abstaction to handle feeds in RSS, Atom and other formats";
homepage = https://wiki.gnome.org/Projects/Libgrss;
license = licenses.lgpl3Plus;
maintainers = gnome3.maintainers;
platforms = platforms.unix;
};
}

View File

@@ -0,0 +1,36 @@
{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection
, glib, libgudev, libevdev, gnome3 }:
let
version = "0.2.1";
pname = "libmanette";
in
stdenv.mkDerivation {
name = "${pname}-${version}";
outputs = [ "out" "dev" ];
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "14vqz30p4693yy3yxs0gj858x25sl2kawib1g9lj8g5frgl0hd82";
};
nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection ];
buildInputs = [ glib libgudev libevdev ];
doCheck = true;
passthru = {
updateScript = gnome3.updateScript {
packageName = pname;
};
};
meta = with stdenv.lib; {
description = "A simple GObject game controller library";
homepage = https://wiki.gnome.org/Apps/Builder;
license = licenses.lgpl21Plus;
maintainers = gnome3.maintainers;
platforms = platforms.unix;
};
}

View File

@@ -31,19 +31,19 @@ let
in stdenv.mkDerivation rec {
pname = "libtensorflow";
version = "1.9.0";
version = "1.10.0";
name = "${pname}-${version}";
src = fetchurl {
url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-${tfType}-${system}-${version}.tar.gz";
sha256 =
if system == "linux-x86_64" then
if cudaSupport
then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3"
else "0l9ps115ng5ffzdwphlqmj3jhidps2v5afppdzrbpzmy41xz0z21"
then "0v66sscxpyixjrf9yjshl001nix233i6chc61akx0kx7ial4l1wn"
else "11sbpcbgdzj8v17mdppfv7v1fn3nbzkdad60gc42y2j6knjbmwxb"
else if system == "darwin-x86_64" then
if cudaSupport
then unavailable
else "1qj0v1706w6mczycdsh38h2glyv5d25v62kdn98wxd5rw8f9v657"
else "11p0f77m4wycpc024mh7jx0kbdhgm0wp6ir6dsa8lkcpdb59bn59"
else unavailable;
};

View File

@@ -0,0 +1,36 @@
{ stdenv, fetchurl, fetchpatch, yasm }:
stdenv.mkDerivation rec {
name = "mac-${version}";
version = "4.11-u4-b5-s7";
src = fetchurl {
url = "https://www.deb-multimedia.org/pool/main/m/monkeys-audio/monkeys-audio_${version}.orig.tar.gz";
sha256 = "16i96cw5r3xbsivjigqp15vv32wa38k86mxq11qx1pzmpryqpqkk";
};
patches = [
(fetchpatch {
name = "mac-4.11.4.5.7-gcc6.patch";
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/mac/files/mac-4.11.4.5.7-gcc6.patch?id=1bd4e0e30e4d8a8862217d7067323851b34c7fe4";
sha256 = "093b8m8p8s6dmc62fc8vb4hlmjc2ncb4rdgc82g0a8gg6w5kcj8x";
})
(fetchpatch {
name = "mac-4.11.4.5.7-output.patch";
url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/mac/files/mac-4.11.4.5.7-output.patch?id=1bd4e0e30e4d8a8862217d7067323851b34c7fe4";
sha256 = "0njmwj6d9jqi4pz4fax02w37gk22vda0grszrs2nn97zzmjl36zk";
})
];
CXXFLAGS = "-DSHNTOOL";
nativeBuildInputs = [ yasm ];
meta = with stdenv.lib; {
description = "APE codec and decompressor";
homepage = http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php;
license = licenses.unfreeRedistributable;
platforms = [ "x86_64-linux" ];
maintainers = with maintainers; [ jfrankenau ];
};
}

View File

@@ -13,6 +13,7 @@
, systemd
, enableProprietaryCodecs ? true
, gn, darwin, openbsm
, ffmpeg ? null
, lib, stdenv # lib.optional, needsPax
}:
@@ -115,7 +116,9 @@ EOF
fi
'';
qmakeFlags = optional enableProprietaryCodecs "-- -proprietary-codecs";
qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64
then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs"
else optional enableProprietaryCodecs "-- -proprietary-codecs";
propagatedBuildInputs = [
# Image formats
@@ -131,6 +134,8 @@ EOF
harfbuzz icu
libevent
] ++ optionals stdenv.hostPlatform.isArm [
ffmpeg
] ++ optionals (!stdenv.isDarwin) [
dbus zlib minizip snappy nss protobuf jsoncpp

View File

@@ -0,0 +1,47 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, cmrt, libdrm, libva, libX11, libGL, wayland }:
stdenv.mkDerivation rec {
name = "intel-hybrid-driver-${version}";
version = "1.0.2";
src = fetchurl {
url = "https://github.com/01org/intel-hybrid-driver/archive/${version}.tar.gz";
sha256 = "0ywdhbvzwzzrq4qhylnw1wc8l3j67h26l0cs1rncwhw05s3ndk8n";
};
patches = [
# driver_init: load libva-x11.so for any ABI version
(fetchurl {
url = https://github.com/01org/intel-hybrid-driver/pull/26.diff;
sha256 = "1ql4mbi5x1d2a5c8mkjvciaq60zj8nhx912992winbhfkyvpb3gx";
})
];
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ cmrt libdrm libva libX11 libGL wayland ];
enableParallelBuilding = true;
configureFlags = [
"--enable-drm"
"--enable-x11"
"--enable-wayland"
];
postPatch = ''
patchShebangs ./src/shaders/gpp.py
'';
preConfigure = ''
sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
'';
meta = with stdenv.lib; {
homepage = https://01.org/linuxmedia;
description = "Intel driver for the VAAPI library with partial HW acceleration";
license = licenses.mit;
maintainers = with maintainers; [ tadfisher ];
platforms = platforms.linux;
};
}

View File

@@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2
, intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext
, enableHybridCodec ? false, vaapi-intel-hybrid
}:
stdenv.mkDerivation rec {
@@ -7,8 +8,8 @@ stdenv.mkDerivation rec {
inherit (libva) version;
src = fetchFromGitHub {
owner = "01org";
repo = "libva-intel-driver";
owner = "intel";
repo = "intel-vaapi-driver";
rev = version;
sha256 = "15ag4al9h6b8f8sw1zpighyhsmr5qfqp1882q7r3gsh5g4cnj763";
};
@@ -21,20 +22,25 @@ stdenv.mkDerivation rec {
sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
'';
postInstall = stdenv.lib.optionalString enableHybridCodec ''
ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/
'';
configureFlags = [
"--enable-drm"
"--enable-x11"
"--enable-wayland"
];
] ++ stdenv.lib.optional enableHybridCodec "--enable-hybrid-codec";
nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ];
buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ];
buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ]
++ stdenv.lib.optional enableHybridCodec vaapi-intel-hybrid;
enableParallelBuilding = true;
meta = with stdenv.lib; {
homepage = https://cgit.freedesktop.org/vaapi/intel-driver/;
homepage = https://01.org/linuxmedia;
license = licenses.mit;
description = "Intel driver for the VAAPI library";
platforms = platforms.unix;

View File

@@ -43,12 +43,12 @@ let
};
in {
wt3 = generic {
version = "3.3.10";
sha256 = "1y25mhghgbgjgycpny0x4z95xn98q0wraab1c5gkwnay097bgwdy";
version = "3.3.11";
sha256 = "1s1bwg3s7brnspr9ya1vg5mr29dbvhf05s606fiv409b7ladqvxq";
};
wt4 = generic {
version = "4.0.3";
sha256 = "01xch5dkpcanwhr515236wa9mdmnq2a2j13dn7smyhwzqgbpknsg";
version = "4.0.4";
sha256 = "17kq9fxc0xqx7q7kyryiph3mg0d3hnd3jw0rl55zvzfsdd71220w";
};
}

View File

@@ -1,8 +1,10 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, boto3
, click
, certifi
, requests-aws4auth
, voluptuous
, pyyaml
, elasticsearch
@@ -22,17 +24,17 @@ buildPythonPackage rec {
sha256 = "e75abeb7f7be939b1c64c071898760dc10ab5f08307c253fc074abf8a41a76f0";
};
# The integration tests require a running elasticsearch cluster.
postUnpackPhase = ''
rm -r test/integration
'';
# The test hangs so we disable it.
doCheck = false;
propagatedBuildInputs = [
click
certifi
requests-aws4auth
voluptuous
pyyaml
elasticsearch
boto3
];
checkInputs = [

View File

@@ -0,0 +1,28 @@
{ lib, buildPythonPackage, fetchPypi, fetchzip, isPy3k, requests }:
with lib;
buildPythonPackage rec {
pname = "requests-aws4auth";
version = "0.9";
src = fetchPypi {
inherit pname version;
sha256 = "0g52a1pm53aqkc9qb5q1m918c1qy6q47c1qz63p5ilynfbs3m5y9";
};
postPatch = optionalString isPy3k ''
sed "s/path_encoding_style/'path_encoding_style'/" \
-i requests_aws4auth/service_parameters.py
'';
propagatedBuildInputs = [ requests ];
# The test fail on Python >= 3 because of module import errors.
doCheck = !isPy3k;
meta = {
description = "Amazon Web Services version 4 authentication for the Python Requests library.";
homepage = https://github.com/sam-washington/requests-aws4auth;
license = licenses.mit;
maintainers = [ maintainers.basvandijk ];
};
}

View File

@@ -1,75 +0,0 @@
{ elk6Version
, enableUnfree ? true
, stdenv
, makeWrapper
, fetchzip
, fetchurl
, nodejs
, coreutils
, which
}:
with stdenv.lib;
let
inherit (builtins) elemAt;
info = splitString "-" stdenv.system;
arch = elemAt info 0;
plat = elemAt info 1;
shas =
if enableUnfree
then {
"x86_64-linux" = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0";
"x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3";
}
else {
"x86_64-linux" = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly";
"x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b";
};
# For the correct phantomjs version see:
# https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js
phantomjs = rec {
name = "phantomjs-${version}-linux-x86_64";
version = "2.1.1";
src = fetchzip {
inherit name;
url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2";
sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv";
};
};
in stdenv.mkDerivation rec {
name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}";
version = elk6Version;
src = fetchurl {
url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz";
sha256 = shas."${stdenv.system}" or (throw "Unknown architecture");
};
buildInputs = [ makeWrapper ];
installPhase = ''
mkdir -p $out/libexec/kibana $out/bin
mv * $out/libexec/kibana/
rm -r $out/libexec/kibana/node
makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
--prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
'' +
# phantomjs is needed in the unfree version. When phantomjs doesn't exist in
# $out/libexec/kibana/data kibana will try to download and unpack it during
# runtime which will fail because the nix store is read-only. So we make sure
# it already exist in the nix store.
optionalString enableUnfree ''
ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name}
'';
meta = {
description = "Visualize logs and time-stamped data";
homepage = http://www.elasticsearch.org/overview/kibana;
license = if enableUnfree then licenses.elastic else licenses.asl20;
maintainers = with maintainers; [ offline rickynils basvandijk ];
platforms = with platforms; unix;
};
}

View File

@@ -1,26 +1,49 @@
{ stdenv, makeWrapper, fetchurl, nodejs, coreutils, which }:
{ elk6Version
, enableUnfree ? true
, stdenv
, makeWrapper
, fetchzip
, fetchurl
, nodejs
, coreutils
, which
}:
with stdenv.lib;
let
inherit (builtins) elemAt;
archOverrides = {
"i686" = "x86";
};
info = splitString "-" stdenv.system;
arch = (elemAt info 0);
elasticArch = archOverrides."${arch}" or arch;
arch = elemAt info 0;
plat = elemAt info 1;
shas = {
"x86_64-linux" = "1wnnrhhpgc58s09p99cmi8r2jmwsd5lmh2inb0k8nmizz5v1sjz0";
"i686-linux" = "0sdx59jlfrf7r9793xpn2vxaxjdczgn3qfw8yny03dcs6fjaxi2y";
"x86_64-darwin" = "0rmp536kn001g52lxngpj6x6d0j3qj0r11d4djbz7h6s5ml03kza";
shas =
if enableUnfree
then {
"x86_64-linux" = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0";
"x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3";
}
else {
"x86_64-linux" = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly";
"x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b";
};
# For the correct phantomjs version see:
# https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js
phantomjs = rec {
name = "phantomjs-${version}-linux-x86_64";
version = "2.1.1";
src = fetchzip {
inherit name;
url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2";
sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv";
};
};
in stdenv.mkDerivation rec {
name = "kibana-${version}";
version = "4.6.5";
name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}";
version = elk6Version;
src = fetchurl {
url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz";
url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz";
sha256 = shas."${stdenv.system}" or (throw "Unknown architecture");
};
@@ -33,13 +56,20 @@ in stdenv.mkDerivation rec {
makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
--prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}"
sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
'' +
# phantomjs is needed in the unfree version. When phantomjs doesn't exist in
# $out/libexec/kibana/data kibana will try to download and unpack it during
# runtime which will fail because the nix store is read-only. So we make sure
# it already exist in the nix store.
optionalString enableUnfree ''
ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name}
'';
meta = {
description = "Visualize logs and time-stamped data";
homepage = http://www.elasticsearch.org/overview/kibana;
license = licenses.asl20;
maintainers = with maintainers; [ offline rickynils ];
license = if enableUnfree then licenses.elastic else licenses.asl20;
maintainers = with maintainers; [ offline rickynils basvandijk ];
platforms = with platforms; unix;
};
}