From 2c591d6622a044b65067e771861e1c966eb04e20 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 10 May 2018 21:10:34 -0700 Subject: [PATCH 1/3] virtualbox: 5.2.10 -> 5.2.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/virtualbox/versions. These checks were done: - built on NixOS - ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage -h’ got 0 exit code - ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage --help’ got 0 exit code - ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage help’ got 0 exit code - ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxBalloonCtrl -h’ got 0 exit code - ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxBalloonCtrl --help’ got 0 exit code - found 5.2.12 with grep in /nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12 - directory tree listing: https://gist.github.com/f9bf852a0a8e6e0b4c44a9b68764850b --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index d09a30f98a74..6a3781d58ee0 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -23,8 +23,8 @@ let # Do not forget to update the hash in ./guest-additions/default.nix! extpack = "5eef217dbe0a8e8caf383ea8db83344517af0f9093041b5345c8468a427b327b"; extpackRev = "122406"; - main = "1k14ngz1gcz02qwbpzfp4kgxv8s24js8pwd5nyyqs6jpxx6557pd"; - version = "5.2.10"; + main = "0n1lip8lkz4qqq5ml47xldsx41919ncfh060i7yj51bhas604q6s"; + version = "5.2.12"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { From b6708a4c9a7f7779e9288d33a09f1dcb2e701be7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 11 May 2018 14:11:52 +0200 Subject: [PATCH 2/3] virtualbox: update extpack and guest additions checksums --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++-- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 6a3781d58ee0..4a4204f06c02 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -21,8 +21,8 @@ let buildType = "release"; # Manually sha256sum the extensionPack file, must be hex! # Do not forget to update the hash in ./guest-additions/default.nix! - extpack = "5eef217dbe0a8e8caf383ea8db83344517af0f9093041b5345c8468a427b327b"; - extpackRev = "122406"; + extpack = "4c36d129f17dcab2bb37292022f1b1adfefa5f32a3161b0d5d40784bc8acf4d0"; + extpackRev = "122591"; main = "0n1lip8lkz4qqq5ml47xldsx41919ncfh060i7yj51bhas604q6s"; version = "5.2.12"; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index b15eed09fde1..6ea0333936b2 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "78a4f18eb0968c7d14dbfe9decf96759c3f85d28f7e3e7ae339266f4a0b22bd1"; + sha256 = "b81d283d9ef88a44e7ac8983422bead0823c825cbfe80417423bd12de91b8046"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; From d4ec02fa7bb79ca1765a6220206b2f633cc080ef Mon Sep 17 00:00:00 2001 From: obadz Date: Sat, 12 May 2018 13:16:03 +0100 Subject: [PATCH 3/3] Revert "Fix pci_get_bus_and_slot removed in kernel 4.17" This reverts commit d25607c79db9fca7f1c8696b792e376b42fb2ecb. Reverted as part of #40313 based on commit author's comment: https://github.com/NixOS/nixpkgs/pull/40313#issuecomment-388409185 --- .../virtualization/virtualbox/default.nix | 4 +++- .../virtualization/virtualbox/kernpcidev.patch | 18 ------------------ 2 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 pkgs/applications/virtualization/virtualbox/kernpcidev.patch diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 4a4204f06c02..71c9c8fa6441 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -94,7 +94,9 @@ in stdenv.mkDerivation { patches = optional enableHardening ./hardened.patch - ++ [ ./qtx11extras.patch ./kernpcidev.patch ]; + ++ [ ./qtx11extras.patch ]; + + postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ diff --git a/pkgs/applications/virtualization/virtualbox/kernpcidev.patch b/pkgs/applications/virtualization/virtualbox/kernpcidev.patch deleted file mode 100644 index 5192227d7d01..000000000000 --- a/pkgs/applications/virtualization/virtualbox/kernpcidev.patch +++ /dev/null @@ -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)