nixpkgs: 2023-08-09 -> 2023-08-10

```
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/e528fa15d5f740a25b5f536c33932db64cb10fc8' (2023-08-09)
  → 'github:nixos/nixpkgs/ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e' (2023-08-10)
```

flake.lock

@@ -85,11 +85,11 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1691565530,
-        "narHash": "sha256-qZZ6DxvS1X/tjxXNUwJrPiaIWLZyWUDM2gkJCi5uZpE=",
+        "lastModified": 1691654369,
+        "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e528fa15d5f740a25b5f536c33932db64cb10fc8",
+        "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
         "type": "github"
       },
       "original": {

nixpatches/list.nix

@@ -319,13 +319,6 @@ in [
     # hash = "sha256-MB3qloOW4pXZmbCIVsUKP2DnPoePmBf+qRc2x/o+nDw=";
     hash = "sha256-uMbnfO0WY2/AFpvvnHQGKVSTE2rPrm3SCef4f04Bt78=";
   })
-  (fetchpatch' {
-    title = "wvkbd: support cross compilation";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/247083";
-    saneCommit = "34379f5770662b483ab0cbe252cf23dd663d84dc";
-    # hash = "sha256-Duim5hPBtfGePBte29ZUtojyRAts9lQlbleUsTJNkwI=";
-    hash = "sha256-aC7zEM4pV4YXh5X0m2nYAkH0vLgVTNq8bgIP8CLZy4I=";
-  })
   (fetchpatch' {
     title = "clapper: support cross compilation";
     saneCommit = "8a171b49aca406f8220f016e56964b3fae53a3df";

overlays/cross.nix

@@ -851,7 +851,11 @@ in {
     # depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ final.pkg-config ];
   });
 
-  mepo-latest = prev.mepo-latest.overrideAttrs (upstream: {
+  mepo = (prev.mepo.override {
+    # nixpkgs mepo correctly puts `zig_0_10.hook` in nativeBuildInputs,
+    # but for some reason that tries to use the host zig instead of the build zig.
+    zig_0_10 = final.buildPackages.zig_0_10;
+  }).overrideAttrs (upstream: {
     dontUseZigCheck = true;
     nativeBuildInputs = upstream.nativeBuildInputs ++ [
       # zig hardcodes the /lib/ld-linux.so interpreter which breaks nix dynamic linking & dep tracking

overlays/preferences.nix

@@ -2,9 +2,6 @@
 # prefer to encode these in `sane.programs`
 # resort to this method for e.g. system dependencies, or things which are referenced from too many places.
 (next: prev: {
-  # it's an input to e.g. sxmo-utils, so we need to override it here.
-  mepo = next.mepo-latest;
-
   pipewire = prev.pipewire.override {
     # avoid a dep on python3.10-PyQt5, which has mixed qt5 versions.
     # this means we lose firewire support (oh well..?)

pkgs/additional/mepo-latest/default.nix

@@ -1,18 +0,0 @@
-{ mepo
-, fetchFromSourcehut
-# to make it easier for consumers to `.override`
-, stdenv
-, zigHook
-}:
-(mepo.override {
-  inherit stdenv zigHook;
-}).overrideAttrs (upstream: {
-  pname = "mepo-latest";
-  version = "1.1.2";
-  src = fetchFromSourcehut {
-    owner = "~mil";
-    repo = "mepo";
-    rev = "1.1.2";
-    hash = "sha256-rKIyhr0sxG1moFsapylJWoAoHi9FSRdugIHr/TqY71s=";
-   };
-})

pkgs/default.nix

@@ -30,7 +30,6 @@ let
     eg25-manager = callPackage ./additional/eg25-manager { };
     feeds = lib.recurseIntoAttrs (callPackage ./additional/feeds { });
     lemoa = callPackage ./additional/lemoa { };
-    mepo-latest = callPackage ./additional/mepo-latest { inherit (unpatched) mepo; };
     jellyfin-media-player-qt6 = callPackage ./additional/jellyfin-media-player-qt6 { };
     firefox-extensions = lib.recurseIntoAttrs (callPackage ./additional/firefox-extensions { });
     gopass-native-messaging-host = callPackage ./additional/gopass-native-messaging-host { };