diff --git a/packages/genodelabs/default.nix b/packages/genodelabs/default.nix index 36c3175..92d830e 100644 --- a/packages/genodelabs/default.nix +++ b/packages/genodelabs/default.nix @@ -4,7 +4,7 @@ with buildPackages; let - version = "20.02"; + version = "2020-05-18"; genodeSources = let platform = targetPackages.targetPlatform; @@ -21,9 +21,12 @@ let in stdenvNoCC.mkDerivation { pname = "genode-sources"; inherit version; - src = fetchurl { - url = "https://github.com/genodelabs/genode/archive/${version}.tar.gz"; - hash = "sha256-ZY9ND6vDA9u127TAv87uOjPuLzRzBPyp5PzD6iM7uNI="; + preferLocalBuild = true; + src = fetchFromGitHub { + owner = "genodelabs"; + repo = "genode"; + rev = "0f27d139bd215c303f01a7491f895f97dedd8eb4"; + hash = "sha256-O2HNjDr1gJzylVksR1mEUcC1uDWvQHzB4TsdWZa5dlY="; }; nativeBuildInputs = [ expect gnumake tcl ]; patches = [ ./LIB.patch ]; @@ -63,7 +66,8 @@ let preparePort = name: { hash ? "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" , patches ? [ ], ... }@args: - let havePatches = patches != [ ]; + let + havePatches = patches != [ ]; version = builtins.getAttr name (import "${genodeSources}/ports.nix"); in stdenvNoCC.mkDerivation (args // { name = name + "-port-" + version; diff --git a/packages/genodelabs/openssl.patch b/packages/genodelabs/openssl.patch deleted file mode 100644 index 73ebb95..0000000 --- a/packages/genodelabs/openssl.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/repos/libports/ports/openssl.port b/repos/libports/ports/openssl.port -index 7cdb34b07a..081a6a9a54 100644 ---- a/repos/libports/ports/openssl.port -+++ b/repos/libports/ports/openssl.port -@@ -2,7 +2,7 @@ LICENSE := OpenSSL - VERSION := 1.0.2q - DOWNLOADS := openssl.archive - --URL(openssl) := https://www.openssl.org/source/openssl-$(VERSION).tar.gz -+URL(openssl) := https://www.openssl.org/source/old/1.0.2/openssl-1.0.2q.tar.gz - SHA(openssl) := 5744cfcbcec2b1b48629f7354203bc1e5e9b5466998bbccc5b5fcde3b18eb684 - DIR(openssl) := src/lib/openssl - diff --git a/packages/genodelabs/ports.nix b/packages/genodelabs/ports.nix index 126451b..d47b73c 100644 --- a/packages/genodelabs/ports.nix +++ b/packages/genodelabs/ports.nix @@ -3,7 +3,7 @@ with buildPackages; { dde_bsd.hash = "sha256-2ilZs6JkcQAvU/sQYnHunGtGRZDt7qLTpKZxQxSOf2I="; dde_ipxe.hash = "sha256-NJ129+DkxFg1fFHJBABBFRRjqEVNSz6v2hEB80AuEM4="; - dde_linux.hash = "sha256-3G5Mprv9ZBNhDJRuVF6Nrkp3KbFaN10IKFq0OdyAY9M="; + dde_linux.hash = "sha256-aUp90z8dtn48QNUqGe1b08RzbESFmCJl7ECZf+lr0rg="; dde_rump = { hash = "sha256-Wr5otGkWEa+5xImsFHQzwap5LckNEbyWA/7xbNcOreI="; nativeBuildInputs = [ subversion ]; @@ -13,31 +13,27 @@ with buildPackages; { jitterentropy.hash = "sha256-6KS732GxtUMz0xPYKtshdn039DgdJq11vTDQesZn4Ds="; jpeg.hash = "sha256-RLVnlrnYGrhqr3Feikoi/BNditCaKN0u3t9/UDpl2wQ="; libc = { - hash = "sha256-RL5l7GHlczc/6Uils9WCuPh9cCawx6XZ4H0HLPdMmAA="; + hash = "sha256-ONmUhqY7rVtH6Z+K7VCY0OMLNi1SF1XCHFjiVY3MW3c="; nativeBuildInputs = [ buildPackages.gcc subversion ]; }; libiconv.hash = "sha256-25YcW5zo1fE33ZolGQroR+KZO8wHEdN1QXa7+MhwS78="; libpng.hash = "sha256-hNmSWN4gEk4UIjzkGD4j5qFooMCVXLwcBeOeFumvh+4="; libssh.hash = "sha256-Z/1YdhISh2kqBjWiTOLkS+usoeeekJvAuYrVUgpxnQM="; lighttpd.hash = "sha256-kEP4Q7rBhN9D77008pkOlnj7sWhk1gbiokzOGGDs2PM="; - lwip.hash = "sha256-mB7RI9ITvS5IDawQS4pXBcDQDQhtXEk3w0Deis+SzLQ="; + lwip.hash = "sha256-RZsqy9iKiUfQzQOrPw2QWiKS5BkVbGe4HseF2DzeWeQ="; lz4.hash = "sha256-nydkAbexaqcKYDzp0TsECKMXyPaoY9rf3MAbU33VPrg="; mesa = { hash = "sha256-5SHU4m3kMmi6Nfj4SBq2tO3mzsIBrRPz64dexjV4pYA="; nativeBuildInputs = [ python ]; }; mupdf.hash = "sha256-6NX7zvOwReBBdz83RxGW2FJWUkqI/DTBkSOCqukidYs="; - openssl = { - hash = "sha256-kLxxl9CNGz8QoXjvYqoEeDeBkp33qElK9HodQJhdAP8="; - patches = [ ./openssl.patch ]; - }; + openssl.hash = "sha256-epRL3SobYQ7xf8qwp6D5xu/Ms2T/LhUjjs273ywWRWg="; qemu-usb.hash = "sha256-F4ZXeH5sx3FOcD42zFOxKFMsqGookKdav1NJ7YgVw98="; stb.hash = "sha256-9LSH1i8jcEvjRAmTvgtK+Axy9hO7uiSzmSgBvs0zkTc="; stdcxx.hash = "sha256-iiE009fL1yE3XJ7HkaJakOiS++m7qONwwGrdJjBXQ7k="; virtualbox5 = { - hash = "sha256-qTdaJX8plHJV9z5MN68gFwGNhcGFu3f2WwkVkBGu/ck="; + hash = "sha256-HLga/0pHQkjdMH7mU194B7pTFJoOoww69Yii4Ixmkxo="; nativeBuildInputs = [ iasl libxslt unzip yasm ]; - patches = [ ./vbox5-iasl.patch ]; }; x86emu.hash = "sha256-QY6OL+cDVjQ67JItP1rS4ufPRGZf43AZtWxwza/0q0w="; zlib.hash = "sha256-j3JXN0f8thrPCvLhYHIPjbGa0t3iynQ/gO7KMlgljq0="; diff --git a/packages/genodelabs/targets.nix b/packages/genodelabs/targets.nix index d033a71..52732b0 100644 --- a/packages/genodelabs/targets.nix +++ b/packages/genodelabs/targets.nix @@ -49,7 +49,7 @@ with ports; { vbox5 = { nativeBuildInputs = with buildPackages; [ iasl yasm ]; - patches = [ ./vbox5-iasl.patch ./vbox-framebuffer-fail-on-fail.patch ./vbox-debug.patch ]; + patches = [ ./vbox-framebuffer-fail-on-fail.patch ./vbox-debug.patch ]; portInputs = [ libc libiconv qemu-usb stdcxx virtualbox5 ]; }; diff --git a/packages/genodelabs/vbox5-iasl.patch b/packages/genodelabs/vbox5-iasl.patch deleted file mode 100644 index ae566ba..0000000 --- a/packages/genodelabs/vbox5-iasl.patch +++ /dev/null @@ -1,121 +0,0 @@ -commit aee5b59c51aacfd625b388a5a1e42440cc14fa3b -Author: Johannes Schlatow -Date: Tue Mar 10 18:27:14 2020 +0100 - - Backport changeset 82268 from virtualbox - - Fixes #3689 - -diff --git a/repos/ports/ports/virtualbox5.hash b/repos/ports/ports/virtualbox5.hash -index dd486cd0fd..5a4e45e541 100644 ---- a/repos/ports/ports/virtualbox5.hash -+++ b/repos/ports/ports/virtualbox5.hash -@@ -1 +1 @@ --5de6eead003606684659956308561f9dffcdffba -+e9340716743511dca9579b5c611862501ecd15e0 -diff --git a/repos/ports/src/virtualbox5/patches/changeset82265.patch b/repos/ports/src/virtualbox5/patches/changeset82265.patch -new file mode 100644 -index 0000000000..7b6ceb71e2 ---- /dev/null -+++ b/repos/ports/src/virtualbox5/patches/changeset82265.patch -@@ -0,0 +1,91 @@ -+--- a/src/app/virtualbox/src/VBox/Devices/PC/vbox-cpuhotplug.dsl 2020-03-10 13:01:35.606326184 +0100 -++++ b/src/app/virtualbox/src/VBox/Devices/PC/vbox-cpuhotplug.dsl 2020-03-10 13:01:22.169523577 +0100 -+@@ -42,7 +42,7 @@ -+ Scope (\_SB) -+ { -+ -+-#define GENERATE_CPU_OBJECT(id, sck, sckuid, cpu, cpuuid) \ -++#define GENERATE_CPU_OBJECT(id, sck, sckuid, cpu) \ -+ Device (sck) \ -+ { \ -+ Name (_HID, "ACPI0004") \ -+@@ -56,7 +56,7 @@ -+ ) \ -+ { \ -+ Name (_HID, "ACPI0007") \ -+- Name (_UID, cpuuid) \ -++ Name (_UID, id) \ -+ Name (_PXM, 0x00) \ -+ \ -+ Method(_MAT, 0, Serialized) \ -+@@ -93,38 +93,38 @@ -+ } \ -+ } \ -+ -+- GENERATE_CPU_OBJECT(0x00, SCK0, "SCKCPU0", CPU0, "SCK0-CPU0") -+- GENERATE_CPU_OBJECT(0x01, SCK1, "SCKCPU1", CPU1, "SCK1-CPU0") -+- GENERATE_CPU_OBJECT(0x02, SCK2, "SCKCPU2", CPU2, "SCK2-CPU0") -+- GENERATE_CPU_OBJECT(0x03, SCK3, "SCKCPU3", CPU3, "SCK3-CPU0") -+- GENERATE_CPU_OBJECT(0x04, SCK4, "SCKCPU4", CPU4, "SCK4-CPU0") -+- GENERATE_CPU_OBJECT(0x05, SCK5, "SCKCPU5", CPU5, "SCK5-CPU0") -+- GENERATE_CPU_OBJECT(0x06, SCK6, "SCKCPU6", CPU6, "SCK6-CPU0") -+- GENERATE_CPU_OBJECT(0x07, SCK7, "SCKCPU7", CPU7, "SCK7-CPU0") -+- GENERATE_CPU_OBJECT(0x08, SCK8, "SCKCPU8", CPU8, "SCK8-CPU0") -+- GENERATE_CPU_OBJECT(0x09, SCK9, "SCKCPU9", CPU9, "SCK9-CPU0") -+- GENERATE_CPU_OBJECT(0x0a, SCKA, "SCKCPUA", CPUA, "SCKA-CPU0") -+- GENERATE_CPU_OBJECT(0x0b, SCKB, "SCKCPUB", CPUB, "SCKB-CPU0") -+- GENERATE_CPU_OBJECT(0x0c, SCKC, "SCKCPUC", CPUC, "SCKC-CPU0") -+- GENERATE_CPU_OBJECT(0x0d, SCKD, "SCKCPUD", CPUD, "SCKD-CPU0") -+- GENERATE_CPU_OBJECT(0x0e, SCKE, "SCKCPUE", CPUE, "SCKE-CPU0") -+- GENERATE_CPU_OBJECT(0x0f, SCKF, "SCKCPUF", CPUF, "SCKF-CPU0") -+- GENERATE_CPU_OBJECT(0x10, SCKG, "SCKCPUG", CPUG, "SCKG-CPU0") -+- GENERATE_CPU_OBJECT(0x11, SCKH, "SCKCPUH", CPUH, "SCKH-CPU0") -+- GENERATE_CPU_OBJECT(0x12, SCKI, "SCKCPUI", CPUI, "SCKI-CPU0") -+- GENERATE_CPU_OBJECT(0x13, SCKJ, "SCKCPUJ", CPUJ, "SCKJ-CPU0") -+- GENERATE_CPU_OBJECT(0x14, SCKK, "SCKCPUK", CPUK, "SCKK-CPU0") -+- GENERATE_CPU_OBJECT(0x15, SCKL, "SCKCPUL", CPUL, "SCKL-CPU0") -+- GENERATE_CPU_OBJECT(0x16, SCKM, "SCKCPUM", CPUM, "SCKM-CPU0") -+- GENERATE_CPU_OBJECT(0x17, SCKN, "SCKCPUN", CPUN, "SCKN-CPU0") -+- GENERATE_CPU_OBJECT(0x18, SCKO, "SCKCPUO", CPUO, "SCKO-CPU0") -+- GENERATE_CPU_OBJECT(0x19, SCKP, "SCKCPUP", CPUP, "SCKP-CPU0") -+- GENERATE_CPU_OBJECT(0x1a, SCKQ, "SCKCPUQ", CPUQ, "SCKQ-CPU0") -+- GENERATE_CPU_OBJECT(0x1b, SCKR, "SCKCPUR", CPUR, "SCKR-CPU0") -+- GENERATE_CPU_OBJECT(0x1c, SCKS, "SCKCPUS", CPUS, "SCKS-CPU0") -+- GENERATE_CPU_OBJECT(0x1d, SCKT, "SCKCPUT", CPUT, "SCKT-CPU0") -+- GENERATE_CPU_OBJECT(0x1e, SCKU, "SCKCPUU", CPUU, "SCKU-CPU0") -+- GENERATE_CPU_OBJECT(0x1f, SCKV, "SCKCPUV", CPUV, "SCKV-CPU0") -++ GENERATE_CPU_OBJECT(0x00, SCK0, "SCKCPU0", CPU0) -++ GENERATE_CPU_OBJECT(0x01, SCK1, "SCKCPU1", CPU1) -++ GENERATE_CPU_OBJECT(0x02, SCK2, "SCKCPU2", CPU2) -++ GENERATE_CPU_OBJECT(0x03, SCK3, "SCKCPU3", CPU3) -++ GENERATE_CPU_OBJECT(0x04, SCK4, "SCKCPU4", CPU4) -++ GENERATE_CPU_OBJECT(0x05, SCK5, "SCKCPU5", CPU5) -++ GENERATE_CPU_OBJECT(0x06, SCK6, "SCKCPU6", CPU6) -++ GENERATE_CPU_OBJECT(0x07, SCK7, "SCKCPU7", CPU7) -++ GENERATE_CPU_OBJECT(0x08, SCK8, "SCKCPU8", CPU8) -++ GENERATE_CPU_OBJECT(0x09, SCK9, "SCKCPU9", CPU9) -++ GENERATE_CPU_OBJECT(0x0a, SCKA, "SCKCPUA", CPUA) -++ GENERATE_CPU_OBJECT(0x0b, SCKB, "SCKCPUB", CPUB) -++ GENERATE_CPU_OBJECT(0x0c, SCKC, "SCKCPUC", CPUC) -++ GENERATE_CPU_OBJECT(0x0d, SCKD, "SCKCPUD", CPUD) -++ GENERATE_CPU_OBJECT(0x0e, SCKE, "SCKCPUE", CPUE) -++ GENERATE_CPU_OBJECT(0x0f, SCKF, "SCKCPUF", CPUF) -++ GENERATE_CPU_OBJECT(0x10, SCKG, "SCKCPUG", CPUG) -++ GENERATE_CPU_OBJECT(0x11, SCKH, "SCKCPUH", CPUH) -++ GENERATE_CPU_OBJECT(0x12, SCKI, "SCKCPUI", CPUI) -++ GENERATE_CPU_OBJECT(0x13, SCKJ, "SCKCPUJ", CPUJ) -++ GENERATE_CPU_OBJECT(0x14, SCKK, "SCKCPUK", CPUK) -++ GENERATE_CPU_OBJECT(0x15, SCKL, "SCKCPUL", CPUL) -++ GENERATE_CPU_OBJECT(0x16, SCKM, "SCKCPUM", CPUM) -++ GENERATE_CPU_OBJECT(0x17, SCKN, "SCKCPUN", CPUN) -++ GENERATE_CPU_OBJECT(0x18, SCKO, "SCKCPUO", CPUO) -++ GENERATE_CPU_OBJECT(0x19, SCKP, "SCKCPUP", CPUP) -++ GENERATE_CPU_OBJECT(0x1a, SCKQ, "SCKCPUQ", CPUQ) -++ GENERATE_CPU_OBJECT(0x1b, SCKR, "SCKCPUR", CPUR) -++ GENERATE_CPU_OBJECT(0x1c, SCKS, "SCKCPUS", CPUS) -++ GENERATE_CPU_OBJECT(0x1d, SCKT, "SCKCPUT", CPUT) -++ GENERATE_CPU_OBJECT(0x1e, SCKU, "SCKCPUU", CPUU) -++ GENERATE_CPU_OBJECT(0x1f, SCKV, "SCKCPUV", CPUV) -+ -+ #undef GENERATE_CPU_OBJECT -+ } -diff --git a/repos/ports/src/virtualbox5/patches/series b/repos/ports/src/virtualbox5/patches/series -index c86455b0fc..4a715967c1 100644 ---- a/repos/ports/src/virtualbox5/patches/series -+++ b/repos/ports/src/virtualbox5/patches/series -@@ -35,3 +35,4 @@ mem_leak.patch - rem_mem.patch - vga.patch - register.patch -+changeset82265.patch