public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qboot: 20150603 -> 20170330, fix build (#47364)

Browse Source 
Switch back to original upstream project which is more recent
than the fork we used.
This commit is contained in:
xeji 2018-09-25 22:32:46 +02:00 committed by GitHub
parent 26272e52a0
commit 4ad424fbd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/virtualization/qboot/default.nix
View File

@ -1,12 +1,13 @@
{ stdenv, fetchgit }: { stdenv, fetchFromGitHub }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "qboot-pre-release"; name = "qboot-20170330";
src = fetchgit { src = fetchFromGitHub {
url = "https://github.com/yangchengwork/qboot"; owner = "bonzini";
rev = "b2bdaf4c878ef34f309c8c79613fabd1b9c4bf75"; repo = "qboot";
sha256 = "00f24125733d24713880e430f409d6ded416286d209c9fabb45541311b01cf8d"; rev = "ac9488f26528394856b94bda0797f5bd9c69a26a";
sha256 = "0l83nbjndin1cbcimkqkiqr5df8d76cnhyk26rd3aygb2bf7cspy";
}; };
installPhase = '' installPhase = ''

2
pkgs/top-level/all-packages.nix
View File

@ -13394,7 +13394,7 @@ with pkgs;
softether_4_25 = callPackage ../servers/softether/4.25.nix { }; softether_4_25 = callPackage ../servers/softether/4.25.nix { };
softether = softether_4_25; softether = softether_4_25;
qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { };
OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; }; OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; };
OVMF-CSM = OVMF.override { openssl = null; }; OVMF-CSM = OVMF.override { openssl = null; };