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

Merge branch 'master'

Browse Source
This commit is contained in:
Vladimír Čunát
2018-03-05 14:53:27 +01:00
parent 25a78f7234 97693915e1
commit 565bd805e6
1666 changed files with 26733 additions and 31238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/virtualization/cbfstool/default.nix
+2 -2
View File
@@ -2,12 +2,12 @@
stdenv.mkDerivation rec {
name = "cbfstool-${version}";
version = "4.5";
version = "4.7";
src = fetchgit {
url = "http://review.coreboot.org/p/coreboot";
rev = "refs/tags/${version}";
sha256 = "0sc2h440x4sfp1lqnmh3xfgymf7j0rqfx00v6jqf0svfbp8a6cq5";
sha256 = "02k63013vf7wgsilslj68fs1x81clvqpn91dydaqhv5aymh73zpi";
};
nativeBuildInputs = [ flex bison ];
pkgs/applications/virtualization/containerd/default.nix
+2 -2
View File
@@ -5,13 +5,13 @@ with lib;
stdenv.mkDerivation rec {
name = "containerd-${version}";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "containerd";
repo = "containerd";
rev = "v${version}";
sha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2";
sha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0";
};
hardeningDisable = [ "fortify" ];
pkgs/applications/virtualization/docker/default.nix
+7 -7
View File
@@ -198,13 +198,13 @@ rec {
# https://github.com/docker/docker-ce/blob/v${version}/components/engine/hack/dockerfile/binaries-commits
docker_17_12 = dockerGen rec {
version = "17.12.0-ce";
rev = "486a48d2701493bb65385788a291e36febb44ec1"; # git commit
sha256 = "14kp7wrzf3s9crk8px1dc575lchyrcl2dqiwr3sgxb9mzjfiyqps";
runcRev = "b2567b37d7b75eb4cf325b77297b140ea686ce8f";
runcSha256 = "0zarsrbfcm1yp6mdl6rcrigdf7nb70xmv2cbggndz0qqyrw0mk0l";
containerdRev = "89623f28b87a6004d4b785663257362d1658a729";
containerdSha256 = "0irx7ps6rhq7z69cr3gspxdr7ywrv6dz62gkr1z2723cki9hsxma";
version = "17.12.1-ce";
rev = "7390fc6103da41cf98ae66cfac80fa143268bf60"; # git commit
sha256 = "14pz5yqsjypjb6xiq828jrg9aq7wajrrf3mnd9109lw224p03d8i";
runcRev = "9f9c96235cc97674e935002fc3d78361b696a69e";
runcSha256 = "18f8vqdbf685dd777pjh8jzpxafw2vapqh4m43xgyi7lfwa0gsln";
containerdRev = "9b55aab90508bd389d7654c4baf173a981477d55";
containerdSha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2";
tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
};
pkgs/applications/virtualization/looking-glass-client/default.nix
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub
, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice_protocol, fontconfig
, pkgconfig, SDL2, SDL, SDL2_ttf, openssl, spice-protocol, fontconfig
, libX11, freefont_ttf
}:
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
SDL SDL2 SDL2_ttf openssl spice_protocol fontconfig
SDL SDL2 SDL2_ttf openssl spice-protocol fontconfig
libX11 freefont_ttf
];
pkgs/applications/virtualization/qemu/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
, pulseSupport ? !stdenv.isDarwin, libpulseaudio
, sdlSupport ? !stdenv.isDarwin, SDL
, vncSupport ? true, libjpeg, libpng
, spiceSupport ? !stdenv.isDarwin, spice, spice_protocol
, spiceSupport ? !stdenv.isDarwin, spice, spice-protocol
, usbredirSupport ? spiceSupport, usbredir
, xenSupport ? false, xen
, hostCpuOnly ? false
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
++ optionals pulseSupport [ libpulseaudio ]
++ optionals sdlSupport [ SDL ]
++ optionals vncSupport [ libjpeg libpng ]
++ optionals spiceSupport [ spice_protocol spice ]
++ optionals spiceSupport [ spice-protocol spice ]
++ optionals usbredirSupport [ usbredir ]
++ optionals stdenv.isLinux [ alsaLib libaio libcap_ng libcap attr ]
++ optionals xenSupport [ xen ];
pkgs/applications/virtualization/remotebox/default.nix
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "remotebox-${version}";
version = "2.2";
version = "2.4";
src = fetchurl {
url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2";
sha256 = "0g7lx5zk9fk5k8alpag45z2zw9bnrlx1zfs63rc3ilfyvm4k4zc5";
sha256 = "14zcpzpdb5gxkxvckcdwq3mfv8b18zirbdskzddhqxjddkzayckz";
};
buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ];
pkgs/applications/virtualization/rkt/default.nix
+1 -1
View File
@@ -58,7 +58,7 @@ in stdenv.mkDerivation rec {
cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/${stage1Dir}/
wrapProgram $out/bin/rkt \
--prefix LD_LIBRARY_PATH : ${systemd.lib}/lib \
--prefix LD_LIBRARY_PATH : "${systemd.lib}/lib:${acl.out}/lib" \
--prefix PATH : ${iptables}/bin
'';
pkgs/applications/virtualization/seabios/default.nix
+2 -2
View File
@@ -3,11 +3,11 @@
stdenv.mkDerivation rec {
name = "seabios-${version}";
version = "1.9.3";
version = "1.11.0";
src = fetchurl {
url = "http://code.coreboot.org/p/seabios/downloads/get/${name}.tar.gz";
sha256 = "13b7n20qfc2cc8v70jvl9r51m563rss9lbk1aflirvnd9705vs0s";
sha256 = "1xwvp77djxbxbxg82hzj26pv6zka3556vkdcp09hnfwapcp46av2";
};
buildInputs = [ iasl python ];
pkgs/applications/virtualization/spice-vdagent/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib,
{stdenv, fetchurl, pkgconfig, alsaLib, spice-protocol, glib,
libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus,
systemd}:
stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
substituteInPlace data/spice-vdagent.desktop --replace /usr $out
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ alsaLib spice_protocol glib
buildInputs = [ alsaLib spice-protocol glib
libpciaccess libxcb libXrandr libXinerama libXfixes
dbus systemd ] ;
meta = {
pkgs/applications/virtualization/virt-manager/default.nix
+4 -4
View File
@@ -1,8 +1,8 @@
{ stdenv, fetchurl, python2Packages, intltool, file
, wrapGAppsHook, gtkvnc, vte, avahi, dconf
, gobjectIntrospection, libvirt-glib, system-libvirt
, gsettings_desktop_schemas, glib, libosinfo, gnome3, gtk3
, spiceSupport ? true, spice_gtk ? null
, gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3
, spiceSupport ? true, spice-gtk ? null
}:
with stdenv.lib;
@@ -24,8 +24,8 @@ python2Packages.buildPythonApplication rec {
buildInputs =
[ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi
gsettings_desktop_schemas libosinfo gtk3
] ++ optional spiceSupport spice_gtk;
gsettings-desktop-schemas libosinfo gtk3
] ++ optional spiceSupport spice-gtk;
propagatedBuildInputs = with python2Packages;
[
pkgs/applications/virtualization/virt-manager/qt.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
, qtbase, qtmultimedia, qtsvg, qttools
, libvncserver, libvirt, pcre, pixman, qtermwidget, spice_gtk, spice_protocol
, libvncserver, libvirt, pcre, pixman, qtermwidget, spice-gtk, spice-protocol
}:
mkDerivation rec {
@@ -21,7 +21,7 @@ mkDerivation rec {
buildInputs = [
qtbase qtmultimedia qtsvg
libvirt libvncserver pcre pixman qtermwidget spice_gtk spice_protocol
libvirt libvncserver pcre pixman qtermwidget spice-gtk spice-protocol
];
nativeBuildInputs = [ cmake pkgconfig qttools ];
pkgs/applications/virtualization/virt-viewer/default.nix
+7 -7
View File
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, yajl, xen
, gsettings_desktop_schemas, makeWrapper, libvirt-glib, libcap_ng, numactl
, libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen
, gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl
, libapparmor
, spiceSupport ? true
, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null
, spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null
}:
assert spiceSupport ->
spice_gtk != null && spice_protocol != null && libcap != null && gdbm != null;
spice-gtk != null && spice-protocol != null && libcap != null && gdbm != null;
with stdenv.lib;
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig intltool ];
buildInputs = [
glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared_mime_info
libvirt yajl gsettings_desktop_schemas makeWrapper libvirt-glib
glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info
libvirt yajl gsettings-desktop-schemas makeWrapper libvirt-glib
libcap_ng numactl libapparmor
] ++ optionals stdenv.isx86_64 [
xen
] ++ optionals spiceSupport [
spice_gtk spice_protocol libcap gdbm
spice-gtk spice-protocol libcap gdbm
];
postInstall = ''
pkgs/applications/virtualization/xen/4.5.nix
+2 -2
View File
@@ -9,7 +9,7 @@
, withLibHVM ? true
# qemu
, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir
, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir
, alsaLib
, ... } @ args:
@@ -29,7 +29,7 @@ let
});
qemuDeps = [
udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir
udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
alsaLib
];
pkgs/applications/virtualization/xen/4.8.nix
+2 -2
View File
@@ -8,7 +8,7 @@
, withLibHVM ? true
# qemu
, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice_protocol, usbredir
, udev, pciutils, xorg, SDL, pixman, acl, glusterfs, spice-protocol, usbredir
, alsaLib
, ... } @ args:
@@ -30,7 +30,7 @@ let
xsa = import ./xsa-patches.nix { inherit fetchpatch; };
qemuDeps = [
udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir
udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
alsaLib
];
in