diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-09 12:01:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-09 12:01:23 +0000 |
| commit | a2bca36cdf57e7db425ddcbc610d1569f295b7ac (patch) | |
| tree | 5bea35510f4ba347ef16916d58d2ab1da505c1d8 /pkgs/development/compilers | |
| parent | d362e7c238e2a4cecd950dbcd3a39ddbf835415f (diff) | |
| parent | 9222b68380eb9195c7c87ca460fcb626d4e600ce (diff) | |
| download | nixpkgs-a2bca36cdf57e7db425ddcbc610d1569f295b7ac.tar nixpkgs-a2bca36cdf57e7db425ddcbc610d1569f295b7ac.tar.gz nixpkgs-a2bca36cdf57e7db425ddcbc610d1569f295b7ac.tar.bz2 nixpkgs-a2bca36cdf57e7db425ddcbc610d1569f295b7ac.tar.lz nixpkgs-a2bca36cdf57e7db425ddcbc610d1569f295b7ac.tar.xz nixpkgs-a2bca36cdf57e7db425ddcbc610d1569f295b7ac.tar.zst nixpkgs-a2bca36cdf57e7db425ddcbc610d1569f295b7ac.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/edk2/default.nix | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index e60d647f6d3..47ea90482b6 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -33,7 +33,7 @@ buildType = if stdenv.isDarwin then edk2 = buildStdenv.mkDerivation { pname = "edk2"; - version = "202108"; + version = "202202"; # submodules src = fetchFromGitHub { @@ -41,21 +41,9 @@ edk2 = buildStdenv.mkDerivation { repo = "edk2"; rev = "edk2-stable${edk2.version}"; fetchSubmodules = true; - sha256 = "1ps244f7y43afxxw6z95xscy24f9mpp8g0mfn90rd4229f193ba2"; + sha256 = "0srmhi6c27n5vyl01nhh0fq8k4vngbwn79siyjvcacjbj2ivhh8d"; }; - patches = [ - # Pull upstream fix for gcc-11 build. - (fetchpatch { - name = "gcc-11-vla.patch"; - url = "https://github.com/google/brotli/commit/0a3944c8c99b8d10cc4325f721b7c273d2b41f7b.patch"; - sha256 = "10c6ibnxh4f8lrh9i498nywgva32jxy2c1zzvr9mcqgblf9d19pj"; - # Apply submodule patch to subdirectory: "a/" -> "BaseTools/Source/C/BrotliCompress/brotli/" - stripLen = 1; - extraPrefix = "BaseTools/Source/C/BrotliCompress/brotli/"; - }) - ]; - buildInputs = [ libuuid pythonEnv ]; makeFlags = [ "-C BaseTools" ] @@ -75,7 +63,7 @@ edk2 = buildStdenv.mkDerivation { meta = with lib; { description = "Intel EFI development kit"; - homepage = "https://sourceforge.net/projects/edk2/"; + homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/"; license = licenses.bsd2; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ]; }; |