Merge master into staging-next

2019-11-25 21:51:57 +01:00
parent 2a2d3de78c 646b279c55
commit 06a054e6eb
252 changed files with 3160 additions and 2290 deletions
@@ -16,7 +16,7 @@ let
  else
    throw "Unsupported architecture";

-  version = (builtins.parseDrvName edk2.name).version;
+  version = lib.getVersion edk2;
 in

 edk2.mkDerivation projectDscPath {