Merge pull request #28618 from lheckemann/edk2-2017

edk2: 2014-12-10 -> UDK2017

authored by Jörg Thalheim and committed by GitHub 0f789e7a 7dd2e70b

+7 -6
+1 -1
pkgs/applications/virtualization/OVMF/default.nix
··· 27 27 export OUTPUT_FD=$fd 28 28 29 29 for file in \ 30 - "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg}; 30 + "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg,FatPkg,CryptoPkg,SourceLevelDebugPkg}; 31 31 do 32 32 ln -sv "$file" . 33 33 done
+6 -5
pkgs/development/compilers/edk2/default.nix
··· 1 - { stdenv, fetchgit, libuuid, python2, iasl }: 1 + { stdenv, fetchFromGitHub, libuuid, python2, iasl }: 2 2 3 3 let 4 4 pythonEnv = python2.withPackages(ps: [ps.tkinter]); ··· 13 13 edk2 = stdenv.mkDerivation { 14 14 name = "edk2-2014-12-10"; 15 15 16 - src = fetchgit { 17 - url = git://github.com/tianocore/edk2; 18 - rev = "684a565a04"; 19 - sha256 = "0s9ywb8w7xzlnmm4kwzykxkrdaw53b7pky121cc9wjkllzqwyxrb"; 16 + src = fetchFromGitHub { 17 + owner = "tianocore"; 18 + repo = "edk2"; 19 + rev = "vUDK2017"; 20 + sha256 = "0sswa028644yr8fbl8j6rhrdm717fj29h4dys3ygklmjhss90a2g"; 20 21 }; 21 22 22 23 buildInputs = [ libuuid pythonEnv];