diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-08-28 11:03:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-28 11:03:47 +0100 |
| commit | 0f789e7a0c00fb708c00a5595f84a727c54aaf3b (patch) | |
| tree | 5daafce5f5c033f9e7db624a0001f2628bc6a452 | |
| parent | 7dd2e70b5f68276532e616781f53824eb3fbc1b3 (diff) | |
| parent | f6afe064a0a1136f1b288299fa90898f4d9938ae (diff) | |
| download | nixpkgs-0f789e7a0c00fb708c00a5595f84a727c54aaf3b.tar nixpkgs-0f789e7a0c00fb708c00a5595f84a727c54aaf3b.tar.gz nixpkgs-0f789e7a0c00fb708c00a5595f84a727c54aaf3b.tar.bz2 nixpkgs-0f789e7a0c00fb708c00a5595f84a727c54aaf3b.tar.lz nixpkgs-0f789e7a0c00fb708c00a5595f84a727c54aaf3b.tar.xz nixpkgs-0f789e7a0c00fb708c00a5595f84a727c54aaf3b.tar.zst nixpkgs-0f789e7a0c00fb708c00a5595f84a727c54aaf3b.zip | |
Merge pull request #28618 from lheckemann/edk2-2017
edk2: 2014-12-10 -> UDK2017
| -rw-r--r-- | pkgs/applications/virtualization/OVMF/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/edk2/default.nix | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 121875a69de..98fb53e57dd 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { export OUTPUT_FD=$fd for file in \ - "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg}; + "${edk2.src}"/{UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg,FatPkg,CryptoPkg,SourceLevelDebugPkg}; do ln -sv "$file" . done diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 1e6e0e8c1f6..b3e2ff909b7 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libuuid, python2, iasl }: +{ stdenv, fetchFromGitHub, libuuid, python2, iasl }: let pythonEnv = python2.withPackages(ps: [ps.tkinter]); @@ -13,10 +13,11 @@ else edk2 = stdenv.mkDerivation { name = "edk2-2014-12-10"; - src = fetchgit { - url = git://github.com/tianocore/edk2; - rev = "684a565a04"; - sha256 = "0s9ywb8w7xzlnmm4kwzykxkrdaw53b7pky121cc9wjkllzqwyxrb"; + src = fetchFromGitHub { + owner = "tianocore"; + repo = "edk2"; + rev = "vUDK2017"; + sha256 = "0sswa028644yr8fbl8j6rhrdm717fj29h4dys3ygklmjhss90a2g"; }; buildInputs = [ libuuid pythonEnv]; |