devices/families/qemu.nix

@@ -42,11 +42,11 @@
           in
           {
             wan = link.build {
-              devpath = "/devices/pci0000:00/0000:00:12.0/virtio0";
+              devpath = "/devices/pci0000:00/0000:00:13.0/virtio0";
               ifname = "wan";
             };
             lan = link.build {
-              devpath = "/devices/pci0000:00/0000:00:13.0/virtio1";
+              devpath = "/devices/pci0000:00/0000:00:14.0/virtio1";
               ifname = "lan";
             };
 

modules/ppp/default.nix

@@ -132,16 +132,6 @@ in
         description = "options supplied on ppp command line";
       };
     };
-
-    # rp-pppoe attempts to drop privs by switching to user "nobody"
-    users.nobody = {
-      uid = 65534;
-      gid = 65534;
-      gecos = "Captain Nemo";
-      dir = "/run/";
-      shell = "/bin/false";
-    };
-
     kernel = {
       config = {
         PPP = "y";

overlay.nix

@@ -302,6 +302,7 @@ extraPkgs
       });
       overrides =
         {
+          nixosTestRunner = true;
           hostCpuTargets = map (f: "${f}-softmmu") [
             "arm"
             "aarch64"
@@ -319,10 +320,6 @@ extraPkgs
         }
         // lib.optionalAttrs (lib.versionOlder lib.version "24.10") {
           texinfo = null;
-          nixosTestRunner = true;
-        }
-        // lib.optionalAttrs (lib.versionAtLeast lib.version "25.04") {
-          minimal = true;
         };
     in
     q.override overrides;

pkgs/pppoe/default.nix

@@ -6,15 +6,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "rp-pppoe";
-  version = "4.0-plus";
+  version = "3.15";
 
   src = fetchFromGitHub {
     owner = "dfskoll";
     repo = "rp-pppoe";
-    rev = "3c0f6c02279881d723743023634b19b77a7d9f82";
-    hash = "sha256-RUUbP5j2I2DERQ7RE8xj4Xt1FoQOanMRoMiB1H6Wrdw=";
-    # rev = "7cfd8c0405d14cf1c8d799d41d8207fd707979c1";
-    # hash = "sha256-MFdCwNj8c52blxEuXH5ltT2yYDmKMH5MLUgtddZV25E=";
+    rev = "7cfd8c0405d14cf1c8d799d41d8207fd707979c1";
+    hash = "sha256-MFdCwNj8c52blxEuXH5ltT2yYDmKMH5MLUgtddZV25E=";
   };
 
   buildInputs = [ ppp ];

pkgs/run-liminix-vm/run-liminix-vm.fnl

@@ -79,25 +79,19 @@
      "-serial" (.. "unix:" sock ",server,nowait")
      "-monitor" (.. "unix:" monitor ",server,nowait")]))
 
-(local netrom (pad-file "/dev/null" 16384))
-
 (fn access-net [override]
   [
    "-netdev"  (.. (or override
                       "socket,mcast=230.0.0.1:1234,localaddr=127.0.0.1")
                   ",id=access")
-   "-device"
-   (.. "virtio-net,disable-legacy=on,romfile=" netrom ",disable-modern=off,netdev=access,mac=ba:ad:1d:ea:21:02")
-   ;; (.. "virtio-net,disable-legacy=on,disable-modern=off,netdev=access,mac=ba:ad:1d:ea:21:02")
+   "-device" "virtio-net,disable-legacy=on,disable-modern=off,netdev=access,mac=ba:ad:1d:ea:21:02"
    ])
 
 (fn local-net [override]
   [
    "-netdev" (.. (or override "socket,mcast=230.0.0.1:1235,localaddr=127.0.0.1")
                  ",id=lan")
-   "-device"
-   (.. "virtio-net,disable-legacy=on,romfile=" netrom ",disable-modern=off,netdev=lan,mac=ba:ad:1d:ea:21:01")
-   ;; (.. "virtio-net,disable-legacy=on,disable-modern=off,netdev=lan,mac=ba:ad:1d:ea:21:01")
+   "-device" "virtio-net,disable-legacy=on,disable-modern=off,netdev=lan,mac=ba:ad:1d:ea:21:01"
    ])
 
 
@@ -138,7 +132,7 @@
                               options.u-boot options.disk-image))
            (appendm (access-net options.wan))
            (appendm (local-net options.lan))
-           (appendm ["-display" "none" "-vga" "none"])))
+           (appendm ["-display" "none"])))
 
 (each [n a (ipairs exec-args)]
   (print (.. (if (> n  1) "     " "") (string.format "%q" a))))