diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-01-30 11:18:56 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-01-30 11:44:08 +0100 |
| commit | c20cc6d0b37b8330eb1bcdc0031b600f2665eb93 (patch) | |
| tree | 7204fef874deec5a890e03e63d271df8dc11460a /pkgs/applications/virtualization/virtualbox | |
| parent | 2dc87881b045ad02abe32c6c486e2b30fceb61de (diff) | |
| download | nixlib-c20cc6d0b37b8330eb1bcdc0031b600f2665eb93.tar nixlib-c20cc6d0b37b8330eb1bcdc0031b600f2665eb93.tar.gz nixlib-c20cc6d0b37b8330eb1bcdc0031b600f2665eb93.tar.bz2 nixlib-c20cc6d0b37b8330eb1bcdc0031b600f2665eb93.tar.lz nixlib-c20cc6d0b37b8330eb1bcdc0031b600f2665eb93.tar.xz nixlib-c20cc6d0b37b8330eb1bcdc0031b600f2665eb93.tar.zst nixlib-c20cc6d0b37b8330eb1bcdc0031b600f2665eb93.zip | |
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.
Diffstat (limited to 'pkgs/applications/virtualization/virtualbox')
3 files changed, 6 insertions, 11 deletions
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" -} |