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

Merge pull request #40313 from r-ryantm/auto-update/virtualbox

Browse Source 
virtualbox: 5.2.10 -> 5.2.12
This commit is contained in:
obadz 2018-05-12 14:35:38 +02:00 committed by GitHub
commit f0057a2f27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,10 +21,10 @@ let
buildType = "release"; buildType = "release";
# Manually sha256sum the extensionPack file, must be hex! # Manually sha256sum the extensionPack file, must be hex!
# Do not forget to update the hash in ./guest-additions/default.nix! # Do not forget to update the hash in ./guest-additions/default.nix!
extpack = "5eef217dbe0a8e8caf383ea8db83344517af0f9093041b5345c8468a427b327b"; extpack = "4c36d129f17dcab2bb37292022f1b1adfefa5f32a3161b0d5d40784bc8acf4d0";
extpackRev = "122406"; extpackRev = "122591";
main = "1k14ngz1gcz02qwbpzfp4kgxv8s24js8pwd5nyyqs6jpxx6557pd"; main = "0n1lip8lkz4qqq5ml47xldsx41919ncfh060i7yj51bhas604q6s";
version = "5.2.10"; version = "5.2.12";
# See https://github.com/NixOS/nixpkgs/issues/672 for details # See https://github.com/NixOS/nixpkgs/issues/672 for details
extensionPack = requireFile rec { extensionPack = requireFile rec {
@ -94,7 +94,9 @@ in stdenv.mkDerivation {
patches = patches =
optional enableHardening ./hardened.patch optional enableHardening ./hardened.patch
++ [ ./qtx11extras.patch ./kernpcidev.patch ]; ++ [ ./qtx11extras.patch ];
postPatch = '' postPatch = ''
sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \

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

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

18
pkgs/applications/virtualization/virtualbox/kernpcidev.patch
View File

@ -1,18 +0,0 @@
diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
index b8019f7..b7d2e39 100644
--- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
@@ -73,8 +73,11 @@ MODULE_LICENSE("GPL");
MODULE_VERSION(VBOX_VERSION_STRING);
#endif
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
+# define PCI_DEV_GET(v,d,p) pci_get_device(v,d,p)
+# define PCI_DEV_PUT(x) pci_dev_put(x)
+# define PCI_DEV_GET_SLOT(bus, devfn) pci_get_domain_bus_and_slot(0, bus, devfn)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
# define PCI_DEV_GET(v,d,p) pci_get_device(v,d,p)
# define PCI_DEV_PUT(x) pci_dev_put(x)
# define PCI_DEV_GET_SLOT(bus, devfn) pci_get_bus_and_slot(bus, devfn)