4 files changed, 66 insertions(+), 26 deletions(-)

M packages/genodelabs/depot-targets.nix
A packages/genodelabs/patches/curl-port.patch
A packages/genodelabs/patches/seoul-port.patch
M packages/genodelabs/ports.nix

@@ 4,7 4,7 @@
 # the package attributes of this flake.
 
 { buildPackages, genodePackages, ports }:
-with ports;
+
 let
   self = genodePackages;
 


@@ 15,7 15,7 @@ let
 
   vbox5' = {
     nativeBuildInputs = with buildPackages; [ iasl yasm ];
-    portInputs = [ libc libiconv qemu-usb stdcxx virtualbox5 ];
+    portInputs = with ports; [ libc libiconv qemu-usb stdcxx virtualbox5 ];
   };
 in {
   acpi_drv = { };


@@ 35,7 35,7 @@ in {
   block_cache = { };
   block_tester = { };
   boot_fb_drv = { };
-  bsd_audio_drv = { };
+  bsd_audio_drv.portInputs = with ports; [ dde_bsd ];
   cached_fs_rom.patches = [ ./patches/cached_fs_rom.patch ];
   chroot = { };
   clipboard = { };


@@ 48,7 48,7 @@ in {
   };
   cpu_burner = { };
   cpu_load_display = { };
-  curl = { };
+  curl.portInputs = with ports; [ curl libc libssh openssl zlib ];
   decorator = { };
   demo = { };
   depot_deploy = { };


@@ 85,7 85,7 @@ in {
   global_keys_handler = { };
   gmp = { };
   gnumake = { };
-  gpt_write.portInputs = [ jitterentropy ];
+  gpt_write.portInputs = with ports; [ jitterentropy ];
   grep = { };
   gui_fader = { };
   gui_fb = { };


@@ 97,27 97,27 @@ in {
   input_event_bridge = { };
   intel_fb_drv = {
     BOARD = "pc";
-    portInputs = [ dde_linux ];
+    portInputs = with ports; [ dde_linux ];
   };
-  ipxe_nic_drv.portInputs = [ dde_ipxe ];
+  ipxe_nic_drv.portInputs = with ports; [ dde_ipxe ];
   jbig2dec = { };
   jpeg = { };
   lan9118_nic_drv = { };
   libarchive = { };
   libc = {
     buildInputs = [ self.vfs ];
-    portInputs = [ libc ];
+    portInputs = with ports; [ libc ];
     patches = [ ./patches/libc.patch ];
   };
-  libcrypto = { };
-  libiconv.portInputs = [ libc libiconv ];
+  libcrypto.portInputs = with ports; [ libc openssl ];
+  libiconv.portInputs = with ports; [ libc libiconv ];
   liblzma = { };
   libpng = { };
   libqgenodeviewwidget = { };
   libqpluginwidget = { };
   libsparkcrypto = { };
-  libssh = { };
-  libssl = { };
+  libssh.portInputs = with ports; [ libc libssh openssl zlib ];
+  libssl.portInputs = with ports; [ libc openssl ];
   lighttpd = { };
   linux_nic_drv.HOST_INC_DIR = [ hostLibcInc ];
   linux_rtc_drv = { };


@@ 134,7 134,7 @@ in {
   mpfr = { };
   mupdf = { };
   nano3d = { };
-  ncurses = { };
+  ncurses.portInputs = with ports; [ libc ncurses ];
   nic_bridge = { };
   nic_loopback = { };
   nic_router = { };


@@ 150,7 150,7 @@ in {
   platform_drv.patches = [ ./patches/platform_drv.patch ];
   posix = {
     buildInputs = [ self.libc ];
-    portInputs = [ ports.libc ];
+    portInputs = with ports; [ ports.libc ];
   };
   ps2_drv = { };
   qt5_base = { };


@@ 176,18 176,18 @@ in {
   rpi_fb_drv = { };
   rtc_drv = { };
   rump = {
-    portInputs = [ dde_rump ];
+    portInputs = with ports; [ dde_rump ];
     buildInputs = with buildPackages; [ zlib ];
   };
   sandbox = { };
   sanitizer = { };
   sculpt_manager = { };
   sed = { };
-  seoul = { };
+  seoul.portInputs = with ports; [ libc seoul ];
   sequence = { };
   spark = { };
-  ssh_terminal.portInputs = [ libc libssh ];
-  stdcxx.portInputs = [ libc stdcxx ];
+  ssh_terminal.portInputs = with ports; [ libc libssh ];
+  stdcxx.portInputs = with ports; [ libc stdcxx ];
   stdin2out = { };
   system_rtc = { };
   tar = { };


@@ 268,28 268,28 @@ in {
   trace_policy = { };
   trace_subject_reporter = { };
   usb_block_drv = { };
-  usb_drv.portInputs = [ dde_linux ];
+  usb_drv.portInputs = with ports; [ dde_linux ];
   usb_hid_drv = { };
   usb_host_drv = { };
   vbox5 = vbox5';
   vbox5-nova = vbox5';
   verify = { };
-  vesa_drv.portInputs = [ libc x86emu ];
+  vesa_drv.portInputs = with ports; [ libc x86emu ];
   vfs.outputs = [ "out" "lib" ];
   vfs_audit = { };
   vfs_block = { };
   vfs_fatfs = { };
   vfs_import.patches = [ ./patches/vfs_import.patch ];
-  vfs_jitterentropy.portInputs = [ jitterentropy libc ];
+  vfs_jitterentropy.portInputs = with ports; [ jitterentropy libc ];
   vfs_lwip = {
     patches = [ ./patches/lwip.patch ];
-    portInputs = [ lwip ];
+    portInputs = with ports; [ lwip ];
   };
-  vfs_lxip.portInputs = [ dde_linux ];
+  vfs_lxip.portInputs = with ports; [ dde_linux ];
   vfs_oss = { };
   vfs_pipe = { };
   vfs_trace = { };
-  vfs_ttf.portInputs = [ libc stb ];
+  vfs_ttf.portInputs = with ports; [ libc stb ];
   vim = { };
   vim-minimal = { };
   virtdev_rom = { };


@@ 298,7 298,7 @@ in {
     postInstall = "mv $out/bin/virtio_*_nic $out/bin/$pname";
   };
   which = { };
-  wifi_drv.portInputs = [ dde_linux libc openssl ];
+  wifi_drv.portInputs = with ports; [ dde_linux libc openssl ];
   window_layouter = { };
   wm = { };
   zlib = { };

@@ 0,0 1,13 @@
+diff --git a/repos/libports/ports/curl.port b/repos/libports/ports/curl.port
+index bf784c1d22..167f650d74 100644
+--- a/repos/libports/ports/curl.port
++++ b/repos/libports/ports/curl.port
+@@ -2,7 +2,7 @@ LICENSE   := MIT
+ DOWNLOADS := curl.archive
+ VERSION   := 7.29.0
+ 
+-URL(curl) := http://curl.haxx.se/download/curl-$(VERSION).tar.gz
++URL(curl) := https://curl.se/download/archeology/curl-7.29.0.tar.gz
+ SHA(curl) := 67dc5b952ac489191b62dbe95b18d336b821649f61404a280186c72e8cd0b9d6
+ SIG(curl) := ${URL(curl)}.asc
+ KEY(curl) := daniel@haxx.se

@@ 0,0 1,18 @@
+diff --git a/repos/ports/ports/seoul.port b/repos/ports/ports/seoul.port
+index df1daca58f..93a5818fcb 100644
+--- a/repos/ports/ports/seoul.port
++++ b/repos/ports/ports/seoul.port
+@@ -29,10 +29,10 @@ additional_steps : $(DOWNLOADS)
+ 	sed -i "/Generated on/d" $(I82576VF_DIR)/genreg.py && \
+ 	echo "call code generators ... takes a while ..." && \
+ 	cd $(EXECUTOR_DIR) && \
+-	          ./build_instructions.py > instructions.inc && \
++	          python2 build_instructions.py > instructions.inc && \
+ 	cd $(CURDIR)/$(I82576VF_DIR) && \
+-	          ./genreg.py reg_pci.py ../../include/model/intel82576vfpci.inc && \
++	          python2 genreg.py reg_pci.py ../../include/model/intel82576vfpci.inc && \
+ 	cd $(CURDIR)/$(I82576VF_DIR) && \
+-	          ./genreg.py reg_mmio.py ../../include/model/intel82576vfmmio.inc
++	          python2 genreg.py reg_mmio.py ../../include/model/intel82576vfmmio.inc
+ 
+ .PHONY: additional_steps

@@ 13,7 13,10 @@ with pkgs;
   };
 
   coreutils.hash = "sha256-ZVlFfLghHcXxwwRsN5xw2bVdIvvXoCNj2oZniOlSXrg=";
-
+  curl = {
+    patches = [ ./patches/curl-port.patch ];
+    hash = "sha256-wpaT6RupLXwgtLdA8v+fpadmWKUiZUCPw8MePXD7SfI=";
+  };
   dde_bsd.hash = "sha256-/n9aHPU6/+AgRSyFD545p3BT63n3myymez1tIRhJisA=";
   dde_ipxe.hash = "sha256-NJ129+DkxFg1fFHJBABBFRRjqEVNSz6v2hEB80AuEM4=";
   dde_linux.hash = "sha256-xHAgeKfArgMGKCGHi0762qkUcY97vbiAQYjM/ZRXCes=";


@@ 48,8 51,14 @@ with pkgs;
   mpc.hash = "sha256-MOs51NYXkNYxBG4d97/fMCx/iYzrNum8jHe3QujF24o=";
   mpfr.hash = "sha256-TSZCAHU7Vtuo9Pbi7v7oDV5Wc6YBVICriR4IbErYW4Q=";
   mupdf.hash = "sha256-6NX7zvOwReBBdz83RxGW2FJWUkqI/DTBkSOCqukidYs=";
+  ncurses = { nativeBuildInputs = [ gcc mawk ]; };
   openssl.hash = "sha256-epRL3SobYQ7xf8qwp6D5xu/Ms2T/LhUjjs273ywWRWg=";
   qemu-usb.hash = "sha256-F4ZXeH5sx3FOcD42zFOxKFMsqGookKdav1NJ7YgVw98=";
+  seoul = {
+    nativeBuildInputs = [ gcc python2 ];
+    patches = [ ./patches/seoul-port.patch ];
+    hash = "sha256-0TYtZrLGl3IOFpRjBRf0fkUXDd1aDlOF8RePfqoKEwA=";
+  };
   stb.hash = "sha256-9LSH1i8jcEvjRAmTvgtK+Axy9hO7uiSzmSgBvs0zkTc=";
   stdcxx.hash = "sha256-4Gn/TyA/q83kyO8f5Wr+gv8fNYR5YPDNZIk7+Ty5fn4=";
   virtualbox5 = {