From c20cc6d0b37b8330eb1bcdc0031b600f2665eb93 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 30 Jan 2017 11:18:56 +0100 Subject: Excise use of importJSON Putting information in external JSON files is IMHO not an improvement over the idiomatic style of Nix expressions. The use of JSON doesn't add anything over Nix expressions (in fact it removes expressive power). And scattering package info over lots of little files makes packages less readable over having the info in one file. --- pkgs/applications/virtualization/virtualbox/default.nix | 7 +++++-- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- pkgs/applications/virtualization/virtualbox/upstream-info.json | 8 -------- 3 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 pkgs/applications/virtualization/virtualbox/upstream-info.json (limited to 'pkgs/applications/virtualization/virtualbox') diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 14a87151e97e..d0c98911387b 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -18,11 +18,14 @@ let python = python2; buildType = "release"; - inherit (importJSON ./upstream-info.json) version extpackRev extpack main; + extpack = "3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5"; + extpackRev = 112026; + main = "98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40"; + version = "5.1.10"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { - name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRev}.vbox-extpack"; + name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${toString extpackRev}.vbox-extpack"; sha256 = extpack; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 5a97d2a8efd0..fe362616bc50 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = (lib.importJSON ../upstream-info.json).guest; + sha256 = "29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json deleted file mode 100644 index 1b85d2b8847e..000000000000 --- a/pkgs/applications/virtualization/virtualbox/upstream-info.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "__NOTE": "Generated using update.py from the same directory.", - "extpack": "3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5", - "extpackRev": "112026", - "guest": "29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41", - "main": "98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40", - "version": "5.1.10" -} -- cgit 1.4.1 From 599df5e1082c246a995ca91fc052021b89724be0 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 2 Feb 2017 19:31:14 +0100 Subject: virtualbox: 5.1.10 -> 5.1.14 --- pkgs/applications/virtualization/virtualbox/default.nix | 8 ++++---- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- pkgs/applications/virtualization/virtualbox/upstream-info.json | 8 ++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 pkgs/applications/virtualization/virtualbox/upstream-info.json (limited to 'pkgs/applications/virtualization/virtualbox') diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index d0c98911387b..7512ddb6b0f8 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -18,10 +18,10 @@ let python = python2; buildType = "release"; - extpack = "3982657fd4853bcbc79b9162e618545a479b65aca08e9ced43a904aeeba3ffa5"; - extpackRev = 112026; - main = "98073b1b2adee4e6553df73cb5bb6ea8ed7c3a41a475757716fd9400393bea40"; - version = "5.1.10"; + extpack = "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85"; + extpackRev = 112924; + main = "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a"; + version = "5.1.14"; # See https://github.com/NixOS/nixpkgs/issues/672 for details extensionPack = requireFile rec { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index fe362616bc50..d73c18badb19 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "29fa0af66a3dd273b0c383c4adee31a52061d52f57d176b67f444698300b8c41"; + sha256 = "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a"; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json new file mode 100644 index 000000000000..8628751f2a18 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/upstream-info.json @@ -0,0 +1,8 @@ +{ + "__NOTE": "Generated using update.py from the same directory.", + "extpack": "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85", + "extpackRev": "112924", + "guest": "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a", + "main": "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a", + "version": "5.1.14" +} -- cgit 1.4.1 From 5ca3a7e56f8b508e513b381b4d62a0682ae94bfa Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 2 Feb 2017 21:11:08 +0100 Subject: virtualbox: remove upstream-info.json as it is no longer used We keep the script as it might be useful in the future. --- pkgs/applications/virtualization/virtualbox/upstream-info.json | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 pkgs/applications/virtualization/virtualbox/upstream-info.json (limited to 'pkgs/applications/virtualization/virtualbox') diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json deleted file mode 100644 index 8628751f2a18..000000000000 --- a/pkgs/applications/virtualization/virtualbox/upstream-info.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "__NOTE": "Generated using update.py from the same directory.", - "extpack": "baddb7cc49224ecc1147f82d77fce2685ac39941ac9b0aac83c270dd6570ea85", - "extpackRev": "112924", - "guest": "1b206b76050dccd3ed979307230f9ddea79551e1c0aba93faee77416733cdc8a", - "main": "8267bb026717c6e55237eb798210767d9c703cfcdf01224d9bc26f7dac9f228a", - "version": "5.1.14" -} -- cgit 1.4.1 From 31eba21d1dab7da2e75be229c542990e8f4b56b6 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 12 Feb 2017 21:06:59 +0100 Subject: virtualbox: force xorg-server-1.18 for now This is getting a little hacky, but hopefully it won't break anything. --- nixos/modules/services/x11/xserver.nix | 2 ++ .../virtualization/virtualbox/guest-additions/default.nix | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'pkgs/applications/virtualization/virtualbox') diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index f5ed52338182..7ac776571a01 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -459,6 +459,8 @@ in knownVideoDrivers; in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver)); + nixpkgs.config.xorg = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { abiCompat = "1.18"; }; + assertions = [ { assertion = config.security.polkit.enable; message = "X11 requires Polkit to be enabled (‘security.polkit.enable = true’)."; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index d73c18badb19..6e58d42a1cb5 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -4,7 +4,14 @@ let version = virtualbox.version; xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version); - xserverABI = xserverVListFunc 0 + xserverVListFunc 1; + + # Forced to 1.18 in + # as it even fails to build otherwise. Still, override this even here, + # in case someone does just a standalone build + # (not via videoDrivers = ["vboxvideo"]). + # It's likely to work again in some future update. + xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1; + in if abi == "119" then "118" else abi; in stdenv.mkDerivation { -- cgit 1.4.1