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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-02-24 09:19:12 +01:00
parent 917f6f987a d7ba376435
commit c2eac6741b
265 changed files with 4145 additions and 1230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/virtualization/firecracker/default.nix
View File

@@ -1,7 +1,7 @@
{ fetchurl, stdenv }:
let
version = "0.14.0";
version = "0.15.0";
baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download";
fetchbin = name: sha256: fetchurl {
@@ -9,8 +9,8 @@ let
inherit sha256;
};
firecracker-bin = fetchbin "firecracker" "02d7s2hzhl13k5linlav7yc4kg9v70sccc3ysfgaqq8hz7zfqywg";
jailer-bin = fetchbin "jailer" "120n14zjnm21s39dza99p003bn5n0n5fzcyaw4l6laq336r24gvi";
firecracker-bin = fetchbin "firecracker" "06b9pj9s4i0wqbh24frsza2j28n7qflp623vwvar5k18jq6jixd0";
jailer-bin = fetchbin "jailer" "17nbsg3yi9rif9qxgp483b2qx0jn2sn1hlvk63gl8m54mnxzmcr3";
in
stdenv.mkDerivation {
name = "firecracker-${version}";

7
pkgs/applications/virtualization/virtualbox/default.nix
View File

@@ -19,9 +19,10 @@ with stdenv.lib;
let
python = python2;
buildType = "release";
# Remember to change the extpackRev and version in extpack.nix as well.
main = "1m48ywa913g6zgqslvrihxs2fbr4gmljypbdpjma2hck6isyi02m";
version = "5.2.22";
# Remember to change the extpackRev and version in extpack.nix and
# guest-additions/default.nix as well.
main = "0rylf1g0vmv0q19iyvyq4dj5h9yvyqqnmmqaqrx93qrv8s1ybssd";
version = "5.2.26";
in stdenv.mkDerivation {
name = "virtualbox-${version}";

4
pkgs/applications/virtualization/virtualbox/extpack.nix
View File

@@ -2,7 +2,7 @@
with lib;
let version = "5.2.22";
let version = "5.2.26";
in
fetchurl rec {
name = "Oracle_VM_VirtualBox_Extension_Pack-${version}.vbox-extpack";
@@ -10,7 +10,7 @@ fetchurl rec {
sha256 =
# Manually sha256sum the extensionPack file, must be hex!
# Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
let value = "779250666551b2f5426e86c2d21ceb0209b46174536971611025f753535131ef";
let value = "4b7caa9b722840d49f154c3e5efb6463b1b7129f09973a25813dfdbccd9debb7";
in assert (builtins.stringLength value) == 64; value;
meta = {

2
pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
View File

@@ -19,7 +19,7 @@ stdenv.mkDerivation {
src = fetchurl {
url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
sha256 = "e51e33500a265b5c2d7bb2d03d32208df880523dfcb1e2dde2c78a0e0daa0603";
sha256 = "0f3w9wjd5aj2khzqh37vdg86wqbbx4gx9aidaai9syn9sk8ca9xr";
};
KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";