tjh.dev / nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
fork atom

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

Switch back to original upstream project which is more recent
than the fork we used.

authored by

xeji and committed by
GitHub 4ad424fb 26272e52

+8 -7
unified split
+7 -6
pkgs/applications/virtualization/qboot/default.nix
··· 1 - { stdenv, fetchgit }: 1 + { stdenv, fetchFromGitHub }: 2 2 3 3 stdenv.mkDerivation { 4 - name = "qboot-pre-release"; 4 + name = "qboot-20170330"; 5 5 6 - src = fetchgit { 7 - url = "https://github.com/yangchengwork/qboot"; 8 - rev = "b2bdaf4c878ef34f309c8c79613fabd1b9c4bf75"; 9 - sha256 = "00f24125733d24713880e430f409d6ded416286d209c9fabb45541311b01cf8d"; 6 + src = fetchFromGitHub { 7 + owner = "bonzini"; 8 + repo = "qboot"; 9 + rev = "ac9488f26528394856b94bda0797f5bd9c69a26a"; 10 + sha256 = "0l83nbjndin1cbcimkqkiqr5df8d76cnhyk26rd3aygb2bf7cspy"; 10 11 }; 11 12 12 13 installPhase = ''
+1 -1
pkgs/top-level/all-packages.nix
··· 13394 13394 softether_4_25 = callPackage ../servers/softether/4.25.nix { }; 13395 13395 softether = softether_4_25; 13396 13396 13397 - qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; }; 13397 + qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { }; 13398 13398 13399 13399 OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; }; 13400 13400 OVMF-CSM = OVMF.override { openssl = null; };