whalebird: fix tray_icon oversight during last update

flake.lock

@@ -60,7 +60,7 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-RM4ZprjMlUTMD0huOPQceF0ujXG2xk7LE1fGXfcg71g=",
+        "narHash": "sha256-FaeqnQPm3MIXkQsNsGTB4A9lN82YKpLkmVHgdJyJNGg=",
         "path": "nixpatches",
         "type": "path"
       },

flake.nix

@@ -43,10 +43,12 @@
 
       evalHost = { name, local, target }:
         let
-          # XXX: we'd prefer to use `nixosSystem = (nixpkgsCompiledBy local).nixos`
+          # XXX: we'd prefer to use `nixosSystem = (nixpkgsCompiledBy target).nixos`
           # but it doesn't propagate config to the underlying pkgs, meaning it doesn't let you use
           # non-free packages even after setting nixpkgs.allowUnfree.
-          nixosSystem = import ((nixpkgsCompiledBy local).path + "/nixos/lib/eval-config.nix");
+          # XXX: patch using the target -- not local -- otherwise the target will
+          # need to emulate the host in order to rebuild!
+          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.
@@ -96,7 +98,7 @@
 
       overlays = rec {
         default = pkgs;
-        pkgs = import ./pkgs/overlay.nix;
+        pkgs = import ./overlays/pkgs.nix;
         passthru =
           let
             stable = next: prev: {

hosts/common/cross.nix

@@ -1,5 +1,12 @@
-{ ... }:
+{ config, ... }:
 
+let
+  mkCrossFrom = localSystem: pkgs: import pkgs.path {
+    inherit localSystem;
+    crossSystem = pkgs.stdenv.hostPlatform.system;
+    inherit (config.nixpkgs) config overlays;
+  };
+in
 {
   # the configuration of which specific package set `pkgs.cross` refers to happens elsewhere;
   # here we just define them all.
@@ -8,8 +15,8 @@
       # 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" = (prev.forceSystem "x86_64-linux" null).appendOverlays next.overlays;
-      crossFrom."aarch64-linux" = (prev.forceSystem "aarch64-linux" null).appendOverlays next.overlays;
+      crossFrom."x86_64-linux" = mkCrossFrom "x86_64-linux" next;
+      crossFrom."aarch64-linux" = mkCrossFrom "aarch64-linux" next;
     })
   ];
 }

hosts/common/default.nix

@@ -39,6 +39,11 @@
   nix.extraOptions = ''
     experimental-features = nix-command flakes
   '';
+  # allow `nix-shell` (and probably nix-index?) to locate our patched and custom packages
+  nix.nixPath = [
+    "nixpkgs=${pkgs.path}"
+    "nixpkgs-overlays=${../..}/overlays"
+  ];
 
   # TODO: move this into home-manager?
   fonts = {

hosts/common/feeds.nix

@@ -41,6 +41,8 @@ let
       );
     } // lib.optionalAttrs (raw.is_podcast or false) {
       format = "podcast";
+    } // lib.optionalAttrs (raw.title or "" != "") {
+      title = lib.mkDefault raw.title;
     };
 
   podcasts = [

hosts/moby/kernel.nix

@@ -125,6 +125,9 @@ in
         # aarch64-unknown-linux-gnu-gcc: error: unrecognized command line option '-mfpu=neon'
         # make[3]: *** [../scripts/Makefile.build:289: drivers/video/fbdev/sun5i-eink-neon.o] Error 1
         FB_SUN5I_EINK = no;
+        # used by the pinephone pro, but fails to compile with:
+        # ../drivers/media/i2c/ov8858.c:1834:27: error: implicit declaration of function 'compat_ptr'
+        VIDEO_OV8858 = no;
       })
     ))
   ];

modules/data/keys.nix

@@ -21,4 +21,10 @@
       servo.root = root;
     };
   };
+
+  com.github = rec {
+    # documented here: <https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/githubs-ssh-key-fingerprints>
+    # Github actually uses multiple keys -- one per format
+    root = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl";
+  };
 }

modules/feeds.nix

@@ -16,6 +16,10 @@ let
         type = types.enum [ "text" "image" "podcast" ];
         default = "text";
       };
+      title = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+      };
       url = mkOption {
         type = types.str;
         description = ''

modules/lib/feeds.nix

@@ -12,8 +12,24 @@ rec {
   # transform a list of feeds into an attrs mapping cat => [ feed0 feed1 ... ]
   partitionByCat = feeds: builtins.groupBy (f: f.cat) feeds;
 
+  xmlTag = tag: close: attrs:
+    let
+      fmt-attrs = builtins.concatStringsSep
+        " "
+        (lib.mapAttrsToList (name: value: ''${lib.escapeXML name}="${lib.escapeXML value}"'') attrs);
+      fmt-close = if close then "/" else "";
+    in
+      ''<${tag} ${fmt-attrs} ${fmt-close}>'';
+
   # represents a single RSS feed.
-  opmlTerminal = feed: ''<outline xmlUrl="${feed.url}" type="rss"/>'';
+  opmlTerminal = feed: xmlTag "outline" true (
+    {
+      xmlUrl = feed.url;
+      type = "rss";
+    } // lib.optionalAttrs (feed.title != null) {
+      title = feed.title;
+    }
+  );
   # a list of RSS feeds.
   opmlTerminals = feeds: lib.concatStringsSep "\n" (builtins.map opmlTerminal feeds);
   # one node which packages some flat grouping of terminals.

modules/packages.nix

@@ -151,7 +151,9 @@ let
     # vlc remembers play position in ~/.config/vlc/vlc-qt-interface.conf
     { pkg = vlc; dir = [ ".config/vlc" ]; }
 
-    whalebird # pleroma client. input is broken on phosh
+    # pleroma client (Electron). input is broken on phosh.
+    { pkg = whalebird; private = [ ".config/Whalebird" ]; }
+
     xdg-utils  # for xdg-open
     xterm  # broken on phosh
   ]

nixpatches/list.nix

@@ -19,6 +19,13 @@
     sha256 = "sha256-Cendm7a23qj/YRBj5qVM8jhl9oTpztaDEkXcSG4dJys=";
   })
 
+  # whalebird: 4.6.5 -> 4.7.4
+  (fetchpatch {
+    # url = "https://git.uninsane.org/colin/nixpkgs/compare/master...pr.whalebird-4.7.4.diff";
+    url = "https://git.uninsane.org/colin/nixpkgs/commit/f5c7c70dde720e990fa7e0748d1dc4764d6e4406.diff";
+    sha256 = "sha256-L9Ie80loaP6yl5ZFnJ1b5WMDpvO1QFE8tbrW5HBauko=";
+  })
+
   ./2022-12-19-i2p-aarch64.patch
 
   # # kaiteki: init at 2022-09-03

overlays/pkgs.nix

@@ -0,0 +1,67 @@
+(next: prev:
+  let
+    sane = rec {
+      #### my own, non-upstreamable packages:
+      sane-scripts = prev.callPackage ../pkgs/sane-scripts { };
+      feeds = prev.callPackage ../pkgs/feeds { };
+      tow-boot-pinephone = prev.callPackage ../pkgs/tow-boot-pinephone { };
+      tow-boot-rpi4 = prev.callPackage ../pkgs/tow-boot-rpi4 { };
+      bootpart-uefi-x86_64 = prev.callPackage ../pkgs/bootpart-uefi-x86_64 { };
+      bootpart-tow-boot-rpi-aarch64 = prev.callPackage ../pkgs/bootpart-tow-boot-rpi-aarch64 {
+        # not sure why i can't just do `next.callPackage` instead
+        inherit tow-boot-rpi4;
+      };
+      bootpart-u-boot-rpi-aarch64 = prev.callPackage ../pkgs/bootpart-u-boot-rpi-aarch64 {
+        # not sure why i can't just do `next.callPackage` instead
+        inherit ubootRaspberryPi4_64bit;
+      };
+      rtl8723cs-firmware = prev.callPackage ../pkgs/rtl8723cs-firmware { };
+      linux-megous = prev.callPackage ../pkgs/linux-megous {
+        kernelPatches = [
+          prev.kernelPatches.bridge_stp_helper
+          prev.kernelPatches.request_key_helper
+        ];
+      };
+
+      sublime-music-mobile = prev.callPackage ../pkgs/sublime-music-mobile { };
+
+      #### customized packages
+      fluffychat-moby = prev.callPackage ../pkgs/fluffychat-moby { };
+      gpodder-configured = prev.callPackage ../pkgs/gpodder-configured { };
+      # nixos-unstable pleroma is too far out-of-date for our db
+      pleroma = prev.callPackage ../pkgs/pleroma { };
+      # jackett doesn't allow customization of the bind address: this will probably always be here.
+      jackett = prev.callPackage ../pkgs/jackett { inherit (prev) jackett; };
+      # mozilla keeps nerfing itself and removing configuration options
+      firefox-unwrapped = prev.callPackage ../pkgs/firefox-unwrapped { };
+
+      # patch rpi uboot with something that fixes USB HDD boot
+      ubootRaspberryPi4_64bit = prev.callPackage ../pkgs/ubootRaspberryPi4_64bit { };
+
+      gocryptfs = prev.callPackage ../pkgs/gocryptfs { inherit (prev) gocryptfs; };
+
+      browserpass = prev.callPackage ../pkgs/browserpass { inherit (prev) browserpass; inherit sane-scripts; };
+
+      fractal-latest = prev.callPackage ../pkgs/fractal-latest { };
+
+      #### TEMPORARY: PACKAGES WAITING TO BE UPSTREAMED
+
+      pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
+        (py-final: py-prev: {
+          feedsearch-crawler = py-final.callPackage ../pkgs/feedsearch-crawler { };
+        })
+      ];
+
+      kaiteki = prev.callPackage ../pkgs/kaiteki { };
+      lightdm-mobile-greeter = prev.callPackage ../pkgs/lightdm-mobile-greeter { };
+      browserpass-extension = prev.callPackage ../pkgs/browserpass-extension { };
+      gopass-native-messaging-host = prev.callPackage ../pkgs/gopass-native-messaging-host { };
+      tokodon = prev.libsForQt5.callPackage ../pkgs/tokodon { };
+      signaldctl = prev.callPackage ../pkgs/signaldctl { };
+      splatmoji = prev.callPackage ../pkgs/splatmoji { };
+      # trust-dns = prev.callPackage ../pkgs/trust-dns { };
+      # kaiteki = prev.kaiteki;
+    };
+  in sane // { inherit sane; }
+)
+

pkgs/feeds/default.nix

@@ -35,7 +35,7 @@
           # but in a way where the least could go wrong.
           pushd "$sources_dir"; mkdir -p "$name"; popd
 
-          ${./update.sh} "$url" "$json_path"
+          ${./update.py} "$url" "$json_path"
           cat "$json_path"
         '';
     }

pkgs/feeds/template.nix

@@ -14,10 +14,7 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit url;
   };
-  passthru.updateScript = [ ./update.sh url jsonPath ];
-  # passthru.updateScript = callPackage ./update.nix {
-  #   inherit url jsonPath;
-  # };
+  passthru.updateScript = [ ./update.py url jsonPath ];
   meta = {
     description = "metadata about any feeds available at ${feedName}";
     homepage = feedName;

pkgs/feeds/update.nix

@@ -1,18 +0,0 @@
-{ lib
-, curl
-, jq
-, runtimeShell
-, writeScript
-# feed-specific args
-, jsonPath
-, url
-}:
-
-let
-  apiQuery = "https://feedsearch.dev/api/v1/search?url=${url}";
-in
-writeScript "update-feed" ''
-  #!${runtimeShell}
-  PATH=${lib.makeBinPath [ curl jq  ]}
-  curl -X GET '${apiQuery}' | jq '.[-1]' > '${jsonPath}'
-''

pkgs/feeds/update.py

@@ -0,0 +1,24 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python3 -p "python3.withPackages (ps: [ ps.feedsearch-crawler ])"
+
+from feedsearch_crawler import search, sort_urls
+from feedsearch_crawler.crawler import coerce_url
+
+import json
+import sys
+url, jsonPath = sys.argv[1:]
+
+url = coerce_url(url, default_scheme="https")
+items = search(url)
+items = sort_urls(items)
+
+# print all results
+serialized = [item.serialize() for item in items]
+for item in serialized:
+        print(json.dumps(item, sort_keys=True, indent=2))
+
+# save the first result to disk
+keep = serialized[0] if serialized else {}
+results = json.dumps(keep, sort_keys=True, indent=2)
+with open(jsonPath, "w") as out:
+        out.write(results)

pkgs/feeds/update.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq
-
-set -xeu -o pipefail
-
-url="$1"
-jsonPath="$2"
-
-apiQuery="https://feedsearch.dev/api/v1/search?url=$url"
-curl -X GET "$apiQuery" | jq '.[0]' > "$jsonPath"

pkgs/feedsearch-crawler/default.nix

@@ -0,0 +1,65 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+# nativeBuildInputs python packages
+, poetry-core
+# propagatedBuildInputs python packages
+, aiodns
+, aiohttp
+, beautifulsoup4
+, brotlipy
+, cchardet
+, feedparser
+, python-dateutil
+, uvloop
+, w3lib
+, yarl
+}:
+
+buildPythonPackage rec {
+  pname = "feedsearch-crawler";
+  version = "2022-05-28";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "DBeath";
+    repo = "feedsearch-crawler";
+    rev = "f49a6f5a07e796e359c4482fd29305b1a019f71f";
+    hash = "sha256-pzvyeXzqdi8pRjk2+QjKhJfgtxbgVT6C08K9fhVFVmY=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'w3lib = "^1.22.0"' 'w3lib = "*"' \
+      --replace 'aiodns = "^2.0.0"' 'aiodns = "*"' \
+      --replace 'uvloop = "^0.15.2"' 'uvloop = "*"'
+  '';
+
+  propagatedBuildInputs = [
+    aiodns
+    aiohttp
+    beautifulsoup4
+    brotlipy
+    cchardet
+    feedparser
+    python-dateutil
+    uvloop
+    w3lib
+    yarl
+  ];
+
+  pythonImportsCheck = [
+    "feedsearch_crawler"
+  ];
+
+  meta = with lib; {
+    homepage = "https://feedsearch.dev";
+    description = "Crawl sites for RSS, Atom, and JSON feeds";
+    license = licenses.mit;
+    maintainers = with maintainers; [ colinsane ];
+  };
+}

pkgs/linux-megous/default.nix

@@ -5,7 +5,7 @@ with lib;
 let
   base = "6.1.0";
   # set to empty if not a release candidate
-  rc = "-rc7";
+  rc = "-rc8";
 in buildLinux (args // rec {
   version = base + rc;
 
@@ -16,9 +16,15 @@ in buildLinux (args // rec {
   extraMeta.branch = versions.majorMinor version;
 
   src = fetchFromGitHub {
+    # HOW TO UPDATE:
+    # - `git fetch` from megous' github.
+    # - there should be some new tag, like `orange-pi-6.1-blah`. use that.
+    # - megi publishes release notes as the most recent commit on any stable branch, so just `git log`.
+    # - orange-pi is listed as the "main integration branch".
+    #   - specific branches like `pp` (pinephone) are dev branches, and probably less stable.
     owner = "megous";
     repo = "linux";
-    rev = "orange-pi-6.1-20221128-1027";
-    hash = "sha256-kEujs4v5rPHPYy4YLyEWHa1Bu0sxoXLgSvmOH9QPWos=";
+    rev = "orange-pi-6.1-20221211-1046";
+    hash = "sha256-TgFXH8bHWHs26rlf7a/zNO9zubFazC8Ie6J1gj4gLgw=";
   };
 } // (args.argsOverride or { }))

pkgs/overlay.nix

@@ -1,60 +0,0 @@
-(next: prev:
-  let
-    sane = rec {
-      #### my own, non-upstreamable packages:
-      sane-scripts = prev.callPackage ./sane-scripts { };
-      feeds = prev.callPackage ./feeds { };
-      tow-boot-pinephone = prev.callPackage ./tow-boot-pinephone { };
-      tow-boot-rpi4 = prev.callPackage ./tow-boot-rpi4 { };
-      bootpart-uefi-x86_64 = prev.callPackage ./bootpart-uefi-x86_64 { };
-      bootpart-tow-boot-rpi-aarch64 = prev.callPackage ./bootpart-tow-boot-rpi-aarch64 {
-        # not sure why i can't just do `next.callPackage` instead
-        inherit tow-boot-rpi4;
-      };
-      bootpart-u-boot-rpi-aarch64 = prev.callPackage ./bootpart-u-boot-rpi-aarch64 {
-        # not sure why i can't just do `next.callPackage` instead
-        inherit ubootRaspberryPi4_64bit;
-      };
-      rtl8723cs-firmware = prev.callPackage ./rtl8723cs-firmware { };
-      linux-megous = prev.callPackage ./linux-megous {
-        kernelPatches = [
-          prev.kernelPatches.bridge_stp_helper
-          prev.kernelPatches.request_key_helper
-        ];
-      };
-
-      sublime-music-mobile = prev.callPackage ./sublime-music-mobile { };
-
-      #### customized packages
-      fluffychat-moby = prev.callPackage ./fluffychat-moby { };
-      gpodder-configured = prev.callPackage ./gpodder-configured { };
-      # nixos-unstable pleroma is too far out-of-date for our db
-      pleroma = prev.callPackage ./pleroma { };
-      # jackett doesn't allow customization of the bind address: this will probably always be here.
-      jackett = prev.callPackage ./jackett { inherit (prev) jackett; };
-      # mozilla keeps nerfing itself and removing configuration options
-      firefox-unwrapped = prev.callPackage ./firefox-unwrapped { };
-
-      # patch rpi uboot with something that fixes USB HDD boot
-      ubootRaspberryPi4_64bit = prev.callPackage ./ubootRaspberryPi4_64bit { };
-
-      gocryptfs = prev.callPackage ./gocryptfs { inherit (prev) gocryptfs; };
-
-      browserpass = prev.callPackage ./browserpass { inherit (prev) browserpass; inherit sane-scripts; };
-
-      fractal-latest = prev.callPackage ./fractal-latest { };
-
-      #### TEMPORARY: PACKAGES WAITING TO BE UPSTREAMED
-      kaiteki = prev.callPackage ./kaiteki { };
-      lightdm-mobile-greeter = prev.callPackage ./lightdm-mobile-greeter { };
-      browserpass-extension = prev.callPackage ./browserpass-extension { };
-      gopass-native-messaging-host = prev.callPackage ./gopass-native-messaging-host { };
-      tokodon = prev.libsForQt5.callPackage ./tokodon { };
-      signaldctl = prev.callPackage ./signaldctl { };
-      splatmoji = prev.callPackage ./splatmoji { };
-      # trust-dns = prev.callPackage ./trust-dns { };
-      # kaiteki = prev.kaiteki;
-    };
-  in sane // { inherit sane; }
-)
-