overlays/pins.nix: split out the test fixes and only apply them on platforms where we're already building from source

flake.lock

@@ -31,23 +31,6 @@
         "type": "github"
       }
     },
-    "nixpkgs": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-unpatched"
-        ]
-      },
-      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-AJlQHunLsnhZ8LdYirwIcqD1iojYJEQAdxGfJn9siPs=",
-        "path": "/nix/store/7s2pgwqd5ch6n53mh2v8hw7d1zp1r654-source/nixpatches",
-        "type": "path"
-      },
-      "original": {
-        "path": "/nix/store/7s2pgwqd5ch6n53mh2v8hw7d1zp1r654-source/nixpatches",
-        "type": "path"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1676162277,
@@ -83,7 +66,6 @@
     "root": {
       "inputs": {
         "mobile-nixos": "mobile-nixos",
-        "nixpkgs": "nixpkgs",
         "nixpkgs-unpatched": "nixpkgs-unpatched",
         "sops-nix": "sops-nix",
         "uninsane-dot-org": "uninsane-dot-org"
@@ -92,7 +74,7 @@
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-unpatched"
         ],
         "nixpkgs-stable": "nixpkgs-stable"
       },
@@ -114,7 +96,7 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-unpatched"
         ]
       },
       "locked": {

flake.nix

@@ -23,10 +23,12 @@
 
     # <https://github.com/nixos/nixpkgs/tree/nixos-unstable>
     nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    nixpkgs = {
-      url = "./nixpatches";
-      inputs.nixpkgs.follows = "nixpkgs-unpatched";
-    };
+
+    # nixpkgs = {
+    #   url = "./nixpatches";
+    #   inputs.nixpkgs.follows = "nixpkgs-unpatched";
+    # };
+
     mobile-nixos = {
       # <https://github.com/nixos/mobile-nixos>
       url = "github:nixos/mobile-nixos";
@@ -35,17 +37,18 @@
     sops-nix = {
       # <https://github.com/Mic92/sops-nix>
       url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
+      # inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-unpatched";
     };
     uninsane-dot-org = {
       url = "git+https://git.uninsane.org/colin/uninsane";
-      inputs.nixpkgs.follows = "nixpkgs";
+      # inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs.follows = "nixpkgs-unpatched";
     };
   };
 
   outputs = {
     self,
-    nixpkgs,
     nixpkgs-unpatched,
     mobile-nixos,
     sops-nix,
@@ -53,6 +56,19 @@
     ...
   }@inputs:
     let
+      inherit (builtins) attrNames listToAttrs map mapAttrs;
+      mapAttrs' = f: set:
+        listToAttrs (map (attr: f attr set.${attr}) (attrNames set));
+      # mapAttrs but without the `name` argument
+      mapAttrValues = f: mapAttrs (_: f);
+      # rather than apply our nixpkgs patches as a flake input, do that here instead.
+      # this (temporarily?) resolves the bad UX wherein a subflake residing in the same git
+      # repo as the main flake causes the main flake to have an unstable hash.
+      nixpkgs = (import ./nixpatches/flake.nix).outputs {
+        self = nixpkgs;
+        nixpkgs = nixpkgs-unpatched;
+      };
+
       nixpkgsCompiledBy = local: nixpkgs.legacyPackages."${local}";
 
       evalHost = { name, local, target }:
@@ -65,11 +81,6 @@
           nixosSystem = import ((nixpkgsCompiledBy target).path + "/nixos/lib/eval-config.nix");
         in
           (nixosSystem {
-            # we use pkgs built for and *by* the target, i.e. emulation, by default.
-            # cross compilation only happens on explicit access to `pkgs.cross`
-            # system = target;
-            # localSystem = local;
-            # crossSystem = target;
             modules = [
               (import ./hosts/instantiate.nix { localSystem = local; hostName = name; })
               self.nixosModules.default
@@ -80,25 +91,45 @@
                   self.overlays.passthru
                   self.overlays.pins
                 ];
-                # nixpkgs.crossSystem = target;
                 nixpkgs.hostPlatform = target;
-                nixpkgs.buildPlatform = local;
+                # nixpkgs.buildPlatform = local;  # set by instantiate.nix instead
               }
             ];
           });
     in {
-      nixosConfigurations = {
-        servo = evalHost { name = "servo"; local = "x86_64-linux"; target = "x86_64-linux"; };
-        desko = evalHost { name = "desko"; local = "x86_64-linux"; target = "x86_64-linux"; };
-        lappy = evalHost { name = "lappy"; local = "x86_64-linux"; target = "x86_64-linux"; };
-        moby = evalHost { name = "moby"; local = "aarch64-linux"; target = "aarch64-linux"; };
-        # special cross-compiled variant, to speed up deploys from an x86 box to the arm target
-        # note that these *do* produce different store paths, because the closure for the tools used to cross compile
-        # v.s. emulate differ.
-        # so deploying foo-cross and then foo incurs some rebuilding.
-        moby-cross = evalHost { name = "moby"; local = "x86_64-linux"; target = "aarch64-linux"; };
-        rescue = evalHost { name = "rescue"; local = "x86_64-linux"; target = "x86_64-linux"; };
-      };
+      nixosConfigurations =
+        let
+          hosts = {
+            servo =  { name = "servo"; local = "x86_64-linux"; target = "x86_64-linux"; };
+            desko =  { name = "desko"; local = "x86_64-linux"; target = "x86_64-linux"; };
+            lappy =  { name = "lappy"; local = "x86_64-linux"; target = "x86_64-linux"; };
+            moby  =  { name = "moby";  local = "x86_64-linux"; target = "aarch64-linux"; };
+            rescue = { name = "rescue"; local = "x86_64-linux"; target = "x86_64-linux"; };
+          };
+          # cross-compiled builds: instead of emulating the host, build using a cross-compiler.
+          # - these are faster to *build* than the emulated variants (useful when tweaking packages),
+          # - but fewer of their packages can be found in upstream caches.
+          cross = mapAttrValues evalHost hosts;
+          emulated = mapAttrValues
+            ({name, local, target}: evalHost {
+              inherit name target;
+              local = null;
+            })
+            hosts;
+          prefixAttrs = prefix: attrs: mapAttrs'
+            (name: value: {
+              name = prefix + name;
+              inherit value;
+            })
+            attrs;
+        in
+          (prefixAttrs "cross-" cross) //
+          (prefixAttrs "emulated-" emulated) // {
+            # prefer native builds for these machines:
+            inherit (emulated) servo desko lappy rescue;
+            # prefer cross-compiled builds for these machines:
+            inherit (cross) moby;
+          };
 
       # unofficial output
       # this produces a EFI-bootable .img file (GPT with a /boot partition and a system (/ or /nix) partition).
@@ -114,9 +145,10 @@
       #   - if fs wasn't resized automatically, then `sudo btrfs filesystem resize max /`
       #   - checkout this flake into /etc/nixos AND UPDATE THE FS UUIDS.
       #   - `nixos-rebuild --flake './#<host>' switch`
-      imgs = builtins.mapAttrs (_: host-dfn: host-dfn.config.system.build.img) self.nixosConfigurations;
+      imgs = mapAttrValues (host: host.config.system.build.img) self.nixosConfigurations;
 
-      host-pkgs = builtins.mapAttrs (_: host-dfn: host-dfn.config.system.build.pkgs) self.nixosConfigurations;
+      # unofficial output
+      host-pkgs = mapAttrValues (host: host.config.system.build.pkgs) self.nixosConfigurations;
 
       overlays = rec {
         default = pkgs;
@@ -159,8 +191,8 @@
         };
 
       # extract only our own packages from the full set
-      packages = builtins.mapAttrs
-        (_: full: full.sane // { inherit (full) sane uninsane-dot-org; })
+      packages = mapAttrValues
+        (full: full.sane // { inherit (full) sane uninsane-dot-org; })
         self.legacyPackages;
 
       apps."x86_64-linux" =

hosts/common/cross/default.nix

@@ -77,37 +77,43 @@
 #   - `file result/bin/bash` does show that it uses the interpreter for the glibc, above
 
 
-{ config, lib, pkgs, ... }:
+{ config, lib, options, pkgs, ... }:
 
 let
-  # these are the overlays which we *also* pass through to the cross and emulated package sets.
-  # TODO: refactor to not specify same overlay in multiple places (here and flake.nix).
-  overlays = [
+  inherit (lib) types mkIf mkOption;
+  cfg = config.sane.cross;
+  # "universal" overlay means it applies to all package sets:
+  # - cross
+  # - emulated
+  # - any arch; etc
+  # these are specified for the primary package set in flake.nix,
+  # except for the "cross only" universal overlays which we avoid specifying for non-cross builds
+  # because they don't affect the result -- only the build process -- so we can disable them as an optimization.
+  crossOnlyUniversalOverlays = [
+    (import ./../../../overlays/disable-flakey-tests.nix)
+  ];
+  universalOverlays = [
     (import ./../../../overlays/pkgs.nix)
     (import ./../../../overlays/pins.nix)
-  ];
-  mkCrossFrom = localSystem: pkgs:
-    import pkgs.path {
-      inherit localSystem;  # localSystem is equivalent to buildPlatform
-      crossSystem = pkgs.stdenv.hostPlatform.system;
-      inherit (config.nixpkgs) config;
-      inherit overlays;
-    };
+  ] ++ crossOnlyUniversalOverlays;
+
   mkEmulated = pkgs:
     import pkgs.path {
       # system = pkgs.stdenv.hostPlatform.system;
       localSystem = pkgs.stdenv.hostPlatform.system;
       inherit (config.nixpkgs) config;
-      inherit overlays;
+      overlays = universalOverlays;
     };
 in
 {
-  # options = {
-  #   perlPackageOverrides = lib.mkOption {
-  #   };
-  # };
+  options = {
+    sane.cross.enablePatches = mkOption {
+      type = types.bool;
+      default = false;
+    };
+  };
 
-  config = {
+  config = mkIf cfg.enablePatches {
     # the configuration of which specific package set `pkgs.cross` refers to happens elsewhere;
     # here we just define them all.
 
@@ -170,14 +176,8 @@ in
       #   Testutf8
       # ;
     });
-    nixpkgs.overlays = [
+    nixpkgs.overlays = crossOnlyUniversalOverlays ++ [
       (next: prev: {
-        # non-emulated packages build *from* local *for* target.
-        # for large packages like the linux kernel which are expensive to build under emulation,
-        # the config can explicitly pull such packages from `pkgs.cross` to do more efficient cross-compilation.
-        # crossFrom."x86_64-linux" = mkCrossFrom "x86_64-linux" prev;
-        # crossFrom."aarch64-linux" = mkCrossFrom "aarch64-linux" prev;
-
         emulated = mkEmulated prev;
       })
       # (next: prev:

hosts/instantiate.nix

@@ -4,7 +4,7 @@
 { hostName, localSystem }:
 
 # module args
-{ config, ... }:
+{ config, lib, ... }:
 
 {
   imports = [
@@ -14,6 +14,8 @@
   ];
 
   networking.hostName = hostName;
+  nixpkgs.buildPlatform = lib.mkIf (localSystem != null) localSystem;
+  sane.cross.enablePatches = localSystem != null;
 
   # nixpkgs.overlays = [
   #   (next: prev: {

overlays/disable-flakey-tests.nix

@@ -0,0 +1,187 @@
+# disable tests for packages which flake.
+# tests will fail for a variety of reasons:
+# - they were coded with timeouts that aren't reliable under heavy load.
+# - they assume a particular architecture (e.g. x86) whereas i compile on multiple archs.
+# - they assume too much about their environment and fail under qemu.
+#
+(next: prev: {
+  ell = prev.ell.overrideAttrs (_upstream: {
+    # 2023/02/11
+    # fixes "TEST FAILED in get_random_return_callback at unit/test-dbus-message-fds.c:278: !l_dbus_message_get_error(message, ((void *)0), ((void *)0))"
+    # unclear *why* this test fails.
+    doCheck = false;
+  });
+  fish = prev.fish.overrideAttrs (_upstream: {
+    # 2023/02/28
+    # The following tests FAILED:
+    #     177 - sigint.fish (Failed)
+    #     241 - torn_escapes.py (Failed)
+    doCheck = false;
+  });
+  gjs = prev.gjs.overrideAttrs (_upstream: {
+    # 2023/01/30: one test times out. probably flakey test that only got built because i patched mesa.
+    doCheck = false;
+  });
+  gssdp = prev.gssdp.overrideAttrs (_upstream: {
+    # 2023/02/11
+    # fixes "ERROR:../tests/test-regression.c:429:test_ggo_7: assertion failed (error == NULL): Failed to set multicast interfaceProtocol not available (gssdp-error, 1)"
+    doCheck = false;
+  });
+  gupnp = prev.gupnp.overrideAttrs (_upstream: {
+    # 2023/02/22
+    # fixes "Bail out! ERROR:../tests/test-bugs.c:205:test_bgo_696762: assertion failed (error == NULL): Failed to set multicast interfaceProtocol not available (gssdp-erro>"
+    doCheck = false;
+  });
+  json-glib = prev.json-glib.overrideAttrs (_upstream: {
+    # 2023/02/11
+    # fixes: "15/15 json-glib:docs / doc-check    TIMEOUT        30.52s   killed by signal 15 SIGTERM"
+    doCheck = false;
+  });
+  lapack-reference = prev.lapack-reference.overrideAttrs (_upstream: {
+    # 2023/02/11: test timeouts
+    # > The following tests FAILED:
+    # >       93 - LAPACK-xlintstz_ztest_in (Timeout)
+    # >        98 - LAPACK-xeigtstz_svd_in (Timeout)
+    # >          99 - LAPACK-xeigtstz_zec_in (Timeout)
+    doCheck = false;
+  });
+  libadwaita = prev.libadwaita.overrideAttrs (_upstream: {
+    # 2023/01/30: one test times out. probably flakey test that only got built because i patched mesa.
+    doCheck = false;
+  });
+  libsecret = prev.libsecret.overrideAttrs (_upstream: {
+    # 2023/01/30: one test times out. probably flakey test that only got built because i patched mesa.
+    doCheck = false;
+  });
+  libuv = prev.libuv.overrideAttrs (_upstream: {
+    # 2023/02/11
+    # 2 tests fail:
+    # - not ok 261 - tcp_bind6_error_addrinuse
+    # - not ok 267 - tcp_bind_error_addrinuse_listen
+    doCheck = false;
+  });
+
+  llvmPackages_12 =
+    let
+      tools = prev.llvmPackages_12.tools.extend (self: super: {
+        libllvm = super.libllvm.overrideAttrs (upstream: {
+          # 2023/02/21: fix: "FAIL: LLVM-Unit :: ExecutionEngine/MCJIT/./MCJITTests/MCJITTest.return_global (2857 of 42084)"
+          # - nix log /nix/store/6vydavlxh1gvs0vmrkcx9qp67g3h7kcz-llvm-12.0.1.drv
+          # - wanted by sequoia, rav1e, rustc-1.66.1  (is this right?)
+          doCheck = false;
+          # upstream sets this with `rec`; TODO: have upstream refer to the final overrideAttrs version of the derivation instead of using rec.
+          cmakeFlags = next.lib.remove "-DLLVM_BUILD_TESTS=ON" upstream.cmakeFlags;
+        });
+      });
+    in
+      # see <nixpkgs:pkgs/development/compilers/llvm/12/default.nix>
+      # - we copy their strategy / attrset mutilation
+      prev.llvmPackages_12 // { inherit tools; } // tools;
+
+  llvmPackages_14 =
+    let
+      tools = prev.llvmPackages_14.tools.extend (self: super: {
+        libllvm = super.libllvm.overrideAttrs (upstream: {
+          # 2023/02/21: fix: "FAIL: LLVM-Unit :: ExecutionEngine/MCJIT/./MCJITTests/MCJITMultipleModuleTest.two_module_global_variables_case (43769 of 46988)"
+          # - nix log /nix/store/ib2yw6sajnhlmibxkrn7lj7chllbr85h-llvm-14.0.6.drv
+          # - wanted by clang-11-12-LLVMgold-path, compiler-rt-libc-12.0.1, clang-wrapper-12.0.1  (is this right?)
+          doCheck = false;
+          # upstream sets this with `rec`; TODO: have upstream refer to the final overrideAttrs version of the derivation instead of using rec.
+          cmakeFlags = next.lib.remove "-DLLVM_BUILD_TESTS=ON" upstream.cmakeFlags;
+        });
+      });
+    in
+      # see <nixpkgs:pkgs/development/compilers/llvm/14/default.nix>
+      # - we copy their strategy / attrset mutilation
+      prev.llvmPackages_14 // { inherit tools; } // tools;
+
+  llvmPackages_15 =
+    let
+      tools = prev.llvmPackages_15.tools.extend (self: super: {
+        libllvm = super.libllvm.override {
+          # 2023/02/21: fix: "FAIL: LLVM-Unit :: ExecutionEngine/MCJIT/./MCJITTests/..."
+          # llvm15 passes doCheck as a call arg, so we don't need to set cmakeFlags explicitly as in previous versions
+          doCheck = false;
+        };
+      });
+    in
+      prev.llvmPackages_15 // { inherit tools; } // tools;
+
+  modemmanager = prev.modemmanager.overrideAttrs (_upstream: {
+    # 2023/02/25
+    # "ERROR:test-modem-helpers.c:257:test_cmgl_response: assertion failed: (list != NULL)"
+    doCheck = false;
+    doInstallCheck = false;  # tests are run during install check??
+  });
+
+  pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
+    (py-next: py-prev: {
+      ipython = py-prev.ipython.overridePythonAttrs (upstream: {
+        # > FAILED IPython/core/tests/test_debugger.py::test_xmode_skip - pexpect.exceptions.TIMEOUT: Timeout exceeded.
+        # > FAILED IPython/core/tests/test_debugger.py::test_decorator_skip - pexpect.exceptions.TIMEOUT: Timeout exceeded.
+        # > FAILED IPython/core/tests/test_debugger.py::test_decorator_skip_disabled - pexpect.exceptions.TIMEOUT: Timeout exceeded.
+        # > FAILED IPython/core/tests/test_debugger.py::test_decorator_skip_with_breakpoint - pexpect.exceptions.TIMEOUT: Timeout exceeded.
+        # > FAILED IPython/core/tests/test_debugger.py::test_where_erase_value - pexpect.exceptions.TIMEOUT: Timeout exceeded.
+        # > FAILED IPython/terminal/tests/test_debug_magic.py::test_debug_magic_passes_through_generators - pexpect.exceptions.TIMEOUT: Timeout exceeded.
+        # > FAILED IPython/terminal/tests/test_embed.py::test_nest_embed - pexpect.exceptions.TIMEOUT: Timeout exceeded.
+        disabledTestPaths = upstream.disabledTestPaths or [] ++ [
+          "IPython/core/tests/test_debugger.py"
+          "IPython/terminal/tests/test_debug_magic.py"
+          "IPython/terminal/tests/test_embed.py"
+        ];
+      });
+      pytest-xdist = py-prev.pytest-xdist.overridePythonAttrs (upstream: {
+        # 2023/02/19
+        # 4 tests fail:
+        # - FAILED: testing/test_remote.py::TestWorkInteractor::* - execnet.gateway_base.TimeoutError: no item after 10.0 seconds
+        # doCheck = false;
+        disabledTestPaths = upstream.disabledTestPaths or [] ++ [
+          "testing/test_remote.py"
+        ];
+        # disabledTests = upstream.disabledTests or [] ++ [
+        #   "test_basic_collect_and_runtests"
+        #   "test_remote_collect_fail"
+        #   "test_remote_collect_skip"
+        #   "test_runtests_all"
+        # ];
+      });
+      twisted = py-prev.twisted.overridePythonAttrs (upstream: {
+        # 2023/02/25
+        # ```
+        # [ERROR]
+        # Traceback (most recent call last):
+        #   File "/nix/store/dcnsxrn8rsfk1dghah7md5glbbnfysq3-python3.10-twisted-22.10.0/lib/python3.10/site-packages/twisted/test/test_udp.py", line 645, in test_interface
+        #     self.assertEqual(self.client.transport.getOutgoingInterface(), "0.0.0.0")
+        #   File "/nix/store/dcnsxrn8rsfk1dghah7md5glbbnfysq3-python3.10-twisted-22.10.0/lib/python3.10/site-packages/twisted/internet/udp.py", line 449, in getOutgoingInterface
+        #     i = self.socket.getsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_IF)
+        # builtins.OSError: [Errno 92] Protocol not available
+        #
+        # twisted.test.test_udp.MulticastTests.test_interface
+        # ```
+        postPatch = upstream.postPatch + ''
+          echo 'MulticastTests.test_interface.skip = "Protocol not available"'>> src/twisted/test/test_udp.py
+        '';
+      });
+    })
+  ];
+  strp = prev.srtp.overrideAttrs (_upstream: {
+    # 2023/02/11
+    # roc_driver test times out after 30s
+    doCheck = false;
+  });
+  tracker = prev.tracker.overrideAttrs (_upstream: {
+    # 2023/02/22
+    # "27/37 tracker:core / service                          TIMEOUT         60.37s   killed by signal 15 SIGTERM"
+    doCheck = false;
+  });
+  udisks2 = prev.udisks2.overrideAttrs (_upstream: {
+    # 2023/02/25
+    # "udisks-test:ERROR:test.c:61:on_completed_expect_failure: assertion failed (message == expected_message): ("Command-line `./udisks-test-helper 4' was signaled with signal SIGSEGV (11):\nstdout: `OK, deliberately causing a segfault\n'\nstderr: `qemu: uncaught target signal 11 (Segmentation fault) - core dumped\n'" == "Command-line `./udisks-test-helper 4' was signaled with signal SIGSEGV (11): OK, deliberately causing a segfault\n")"
+    doCheck = false;
+  });
+  upower = prev.upower.overrideAttrs (_upstream: {
+    # 2023/02/25
+    # "Tests.test_battery_state_guessing                          TIMEOUT        60.80s   killed by signal 15 SIGTERM"
+    doCheck = false;
+  });
+})

overlays/pins.nix

@@ -15,184 +15,4 @@
   # so just forward the unstable packages.
   inherit (next.stable or prev)
   ;
-
-  ell = prev.ell.overrideAttrs (_upstream: {
-    # 2023/02/11
-    # fixes "TEST FAILED in get_random_return_callback at unit/test-dbus-message-fds.c:278: !l_dbus_message_get_error(message, ((void *)0), ((void *)0))"
-    # unclear *why* this test fails.
-    doCheck = false;
-  });
-  fish = prev.fish.overrideAttrs (_upstream: {
-    # 2023/02/28
-    # The following tests FAILED:
-    #     177 - sigint.fish (Failed)
-    #     241 - torn_escapes.py (Failed)
-    doCheck = false;
-  });
-  gjs = prev.gjs.overrideAttrs (_upstream: {
-    # 2023/01/30: one test times out. probably flakey test that only got built because i patched mesa.
-    doCheck = false;
-  });
-  gssdp = prev.gssdp.overrideAttrs (_upstream: {
-    # 2023/02/11
-    # fixes "ERROR:../tests/test-regression.c:429:test_ggo_7: assertion failed (error == NULL): Failed to set multicast interfaceProtocol not available (gssdp-error, 1)"
-    doCheck = false;
-  });
-  gupnp = prev.gupnp.overrideAttrs (_upstream: {
-    # 2023/02/22
-    # fixes "Bail out! ERROR:../tests/test-bugs.c:205:test_bgo_696762: assertion failed (error == NULL): Failed to set multicast interfaceProtocol not available (gssdp-erro>"
-    doCheck = false;
-  });
-  json-glib = prev.json-glib.overrideAttrs (_upstream: {
-    # 2023/02/11
-    # fixes: "15/15 json-glib:docs / doc-check    TIMEOUT        30.52s   killed by signal 15 SIGTERM"
-    doCheck = false;
-  });
-  lapack-reference = prev.lapack-reference.overrideAttrs (_upstream: {
-    # 2023/02/11: test timeouts
-    # > The following tests FAILED:
-    # >       93 - LAPACK-xlintstz_ztest_in (Timeout)
-    # >        98 - LAPACK-xeigtstz_svd_in (Timeout)
-    # >          99 - LAPACK-xeigtstz_zec_in (Timeout)
-    doCheck = false;
-  });
-  libadwaita = prev.libadwaita.overrideAttrs (_upstream: {
-    # 2023/01/30: one test times out. probably flakey test that only got built because i patched mesa.
-    doCheck = false;
-  });
-  libsecret = prev.libsecret.overrideAttrs (_upstream: {
-    # 2023/01/30: one test times out. probably flakey test that only got built because i patched mesa.
-    doCheck = false;
-  });
-  libuv = prev.libuv.overrideAttrs (_upstream: {
-    # 2023/02/11
-    # 2 tests fail:
-    # - not ok 261 - tcp_bind6_error_addrinuse
-    # - not ok 267 - tcp_bind_error_addrinuse_listen
-    doCheck = false;
-  });
-
-  llvmPackages_12 =
-    let
-      tools = prev.llvmPackages_12.tools.extend (self: super: {
-        libllvm = super.libllvm.overrideAttrs (upstream: {
-          # 2023/02/21: fix: "FAIL: LLVM-Unit :: ExecutionEngine/MCJIT/./MCJITTests/MCJITTest.return_global (2857 of 42084)"
-          # - nix log /nix/store/6vydavlxh1gvs0vmrkcx9qp67g3h7kcz-llvm-12.0.1.drv
-          # - wanted by sequoia, rav1e, rustc-1.66.1  (is this right?)
-          doCheck = false;
-          # upstream sets this with `rec`; TODO: have upstream refer to the final overrideAttrs version of the derivation instead of using rec.
-          cmakeFlags = next.lib.remove "-DLLVM_BUILD_TESTS=ON" upstream.cmakeFlags;
-        });
-      });
-    in
-      # see <nixpkgs:pkgs/development/compilers/llvm/12/default.nix>
-      # - we copy their strategy / attrset mutilation
-      prev.llvmPackages_12 // { inherit tools; } // tools;
-
-  llvmPackages_14 =
-    let
-      tools = prev.llvmPackages_14.tools.extend (self: super: {
-        libllvm = super.libllvm.overrideAttrs (upstream: {
-          # 2023/02/21: fix: "FAIL: LLVM-Unit :: ExecutionEngine/MCJIT/./MCJITTests/MCJITMultipleModuleTest.two_module_global_variables_case (43769 of 46988)"
-          # - nix log /nix/store/ib2yw6sajnhlmibxkrn7lj7chllbr85h-llvm-14.0.6.drv
-          # - wanted by clang-11-12-LLVMgold-path, compiler-rt-libc-12.0.1, clang-wrapper-12.0.1  (is this right?)
-          doCheck = false;
-          # upstream sets this with `rec`; TODO: have upstream refer to the final overrideAttrs version of the derivation instead of using rec.
-          cmakeFlags = next.lib.remove "-DLLVM_BUILD_TESTS=ON" upstream.cmakeFlags;
-        });
-      });
-    in
-      # see <nixpkgs:pkgs/development/compilers/llvm/14/default.nix>
-      # - we copy their strategy / attrset mutilation
-      prev.llvmPackages_14 // { inherit tools; } // tools;
-
-  llvmPackages_15 =
-    let
-      tools = prev.llvmPackages_15.tools.extend (self: super: {
-        libllvm = super.libllvm.override {
-          # 2023/02/21: fix: "FAIL: LLVM-Unit :: ExecutionEngine/MCJIT/./MCJITTests/..."
-          # llvm15 passes doCheck as a call arg, so we don't need to set cmakeFlags explicitly as in previous versions
-          doCheck = false;
-        };
-      });
-    in
-      prev.llvmPackages_15 // { inherit tools; } // tools;
-
-  modemmanager = prev.modemmanager.overrideAttrs (_upstream: {
-    # 2023/02/25
-    # "ERROR:test-modem-helpers.c:257:test_cmgl_response: assertion failed: (list != NULL)"
-    doCheck = false;
-    doInstallCheck = false;  # tests are run during install check??
-  });
-
-  pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
-    (py-next: py-prev: {
-      ipython = py-prev.ipython.overridePythonAttrs (upstream: {
-        # > FAILED IPython/core/tests/test_debugger.py::test_xmode_skip - pexpect.exceptions.TIMEOUT: Timeout exceeded.
-        # > FAILED IPython/core/tests/test_debugger.py::test_decorator_skip - pexpect.exceptions.TIMEOUT: Timeout exceeded.
-        # > FAILED IPython/core/tests/test_debugger.py::test_decorator_skip_disabled - pexpect.exceptions.TIMEOUT: Timeout exceeded.
-        # > FAILED IPython/core/tests/test_debugger.py::test_decorator_skip_with_breakpoint - pexpect.exceptions.TIMEOUT: Timeout exceeded.
-        # > FAILED IPython/core/tests/test_debugger.py::test_where_erase_value - pexpect.exceptions.TIMEOUT: Timeout exceeded.
-        # > FAILED IPython/terminal/tests/test_debug_magic.py::test_debug_magic_passes_through_generators - pexpect.exceptions.TIMEOUT: Timeout exceeded.
-        # > FAILED IPython/terminal/tests/test_embed.py::test_nest_embed - pexpect.exceptions.TIMEOUT: Timeout exceeded.
-        disabledTestPaths = upstream.disabledTestPaths or [] ++ [
-          "IPython/core/tests/test_debugger.py"
-          "IPython/terminal/tests/test_debug_magic.py"
-          "IPython/terminal/tests/test_embed.py"
-        ];
-      });
-      pytest-xdist = py-prev.pytest-xdist.overridePythonAttrs (upstream: {
-        # 2023/02/19
-        # 4 tests fail:
-        # - FAILED: testing/test_remote.py::TestWorkInteractor::* - execnet.gateway_base.TimeoutError: no item after 10.0 seconds
-        # doCheck = false;
-        disabledTestPaths = upstream.disabledTestPaths or [] ++ [
-          "testing/test_remote.py"
-        ];
-        # disabledTests = upstream.disabledTests or [] ++ [
-        #   "test_basic_collect_and_runtests"
-        #   "test_remote_collect_fail"
-        #   "test_remote_collect_skip"
-        #   "test_runtests_all"
-        # ];
-      });
-      twisted = py-prev.twisted.overridePythonAttrs (upstream: {
-        # 2023/02/25
-        # ```
-        # [ERROR]
-        # Traceback (most recent call last):
-        #   File "/nix/store/dcnsxrn8rsfk1dghah7md5glbbnfysq3-python3.10-twisted-22.10.0/lib/python3.10/site-packages/twisted/test/test_udp.py", line 645, in test_interface
-        #     self.assertEqual(self.client.transport.getOutgoingInterface(), "0.0.0.0")
-        #   File "/nix/store/dcnsxrn8rsfk1dghah7md5glbbnfysq3-python3.10-twisted-22.10.0/lib/python3.10/site-packages/twisted/internet/udp.py", line 449, in getOutgoingInterface
-        #     i = self.socket.getsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_IF)
-        # builtins.OSError: [Errno 92] Protocol not available
-        #
-        # twisted.test.test_udp.MulticastTests.test_interface
-        # ```
-        postPatch = upstream.postPatch + ''
-          echo 'MulticastTests.test_interface.skip = "Protocol not available"'>> src/twisted/test/test_udp.py
-        '';
-      });
-    })
-  ];
-  strp = prev.srtp.overrideAttrs (_upstream: {
-    # 2023/02/11
-    # roc_driver test times out after 30s
-    doCheck = false;
-  });
-  tracker = prev.tracker.overrideAttrs (_upstream: {
-    # 2023/02/22
-    # "27/37 tracker:core / service                          TIMEOUT         60.37s   killed by signal 15 SIGTERM"
-    doCheck = false;
-  });
-  udisks2 = prev.udisks2.overrideAttrs (_upstream: {
-    # 2023/02/25
-    # "udisks-test:ERROR:test.c:61:on_completed_expect_failure: assertion failed (message == expected_message): ("Command-line `./udisks-test-helper 4' was signaled with signal SIGSEGV (11):\nstdout: `OK, deliberately causing a segfault\n'\nstderr: `qemu: uncaught target signal 11 (Segmentation fault) - core dumped\n'" == "Command-line `./udisks-test-helper 4' was signaled with signal SIGSEGV (11): OK, deliberately causing a segfault\n")"
-    doCheck = false;
-  });
-  upower = prev.upower.overrideAttrs (_upstream: {
-    # 2023/02/25
-    # "Tests.test_battery_state_guessing                          TIMEOUT        60.80s   killed by signal 15 SIGTERM"
-    doCheck = false;
-  });
 })

readme.md

@@ -32,6 +32,13 @@ this can then be `dd`'d onto a disk and directly booted from a EFI system.
 there's some post-processing to do before running a rebuild on the deployed system (deploying ssh keys, optionally changing fs UUIDs, etc).
 refer to flake.nix for more details.
 
+## remote deployment
+
+some of my systems support cross compilation (i.e. building from x86-64 for an aarch64 host without using emulation).
+- `nixos-rebuild --flake '.#moby-cross' build`
+- `sudo nix sign-paths -r -k /run/secrets/nix_serve_privkey $(readlink ./result)`
+- `nixos-rebuild --flake '.#moby-cross' switch --target-host colin@moby --use-remote-sudo`
+
 ## building packages
 
 build anything with
@@ -45,11 +52,15 @@ on the other hand the `packages` output contains only my own packages.
 
 in addition, my packages are placed into both the global scope and a `sane` scope.
 so use the scoped path when you want to be explicit.
-
 ```
 nix build sane.linux-megous
 ```
 
+to build a package precisely how a specific host would see it (in case the host's config customizes it):
+```
+nix build '.#host-pkgs.moby-cross.xdg-utils'
+```
+
 ## using this repo in your own config
 
 this should be a pretty "standard" flake. just reference it, and import either