Merge master into staging-next

2020-02-17 15:12:28 +01:00
parent 9ed0635a30 3285f0f2ff
commit ec1184f461
112 changed files with 1748 additions and 1807 deletions
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -14,13 +14,13 @@ else

 edk2 = stdenv.mkDerivation {
  pname = "edk2";
-  version = "201905";
+  version = "201911";

  # submodules
  src = fetchgit {
    url = "https://github.com/tianocore/edk2";
    rev = "edk2-stable${edk2.version}";
-    sha256 = "0fk40h4nj4qg8shg0yd1zj4iyspslms5fx95ysi04akv90k5sqkn";
+    sha256 = "1rmvb4w043v25cppsqxqrpzqqcay3yrzsrhhzm2q9bncrj56vm8q";
  };

  buildInputs = [ libuuid pythonEnv ];