From 7d42a6c466fadf353a1840de4e2876b7b60728d1 Mon Sep 17 00:00:00 2001 From: imxyy_soope_ Date: Wed, 22 Jul 2026 17:00:12 +0800 Subject: [PATCH] flake: reorganize overlays under flake/ as a plain overlay list --- flake.nix | 1 - flake/hosts.nix | 15 ++------ .../overlays}/cage-specify-output-name.patch | 0 flake/overlays/default.nix | 34 ++++++++++++++++++ overlays/default.nix | 23 ------------ ...rix-telegram-use-importlib-resources.patch | 36 ------------------- 6 files changed, 36 insertions(+), 73 deletions(-) rename {overlays => flake/overlays}/cage-specify-output-name.patch (100%) create mode 100644 flake/overlays/default.nix delete mode 100644 overlays/default.nix delete mode 100644 overlays/mautrix-telegram-use-importlib-resources.patch diff --git a/flake.nix b/flake.nix index a35dd00..edde1b2 100644 --- a/flake.nix +++ b/flake.nix @@ -158,7 +158,6 @@ ./flake/hosts.nix ./flake/pkgs.nix ./treefmt.nix - ./overlays ]; nixosHosts = { diff --git a/flake/hosts.nix b/flake/hosts.nix index 0e0c744..119fb9b 100644 --- a/flake/hosts.nix +++ b/flake/hosts.nix @@ -9,22 +9,11 @@ }: let vars = import ../vars.nix; - pkgsModule = { config, ... }: { + pkgsModule = args: { nixpkgs = lib.mkMerge [ pkgsParams { - overlays = [ - (final: _prev: { - stable = import inputs.nixpkgs-stable { - inherit (final.stdenv.hostPlatform) system; - inherit (config.nixpkgs) config; - }; - master = import inputs.nixpkgs-master { - inherit (final.stdenv.hostPlatform) system; - inherit (config.nixpkgs) config; - }; - }) - ]; + overlays = (import ./overlays args); } ]; }; diff --git a/overlays/cage-specify-output-name.patch b/flake/overlays/cage-specify-output-name.patch similarity index 100% rename from overlays/cage-specify-output-name.patch rename to flake/overlays/cage-specify-output-name.patch diff --git a/flake/overlays/default.nix b/flake/overlays/default.nix new file mode 100644 index 0000000..7a23100 --- /dev/null +++ b/flake/overlays/default.nix @@ -0,0 +1,34 @@ +{ + inputs, + lib, + config, + ... +}: +[ + ( + final: prev: + lib.infuse prev { + cage.__output.patches.__append = [ ./cage-specify-output-name.patch ]; + bottles.__input.removeWarningPopup.__assign = true; + + easytier.__assign = final.stable.easytier; + + python314Packages.patool.__input.file.__output.postPatch.__append = + lib.warn "Remove `file` patch once https://github.com/NixOS/nixpkgs/pull/540742 is merged" '' + substituteInPlace src/landlock.c --replace-fail \ + "LANDLOCK_ACCESS_FS_READ_FILE | LANDLOCK_ACCESS_FS_READ_DIR" \ + "LANDLOCK_ACCESS_FS_READ_FILE | LANDLOCK_ACCESS_FS_READ_DIR | LANDLOCK_ACCESS_FS_EXECUTE" + ''; + } + ) + (final: _prev: { + stable = import inputs.nixpkgs-stable { + inherit (final.stdenv.hostPlatform) system; + inherit (config.nixpkgs) config; + }; + master = import inputs.nixpkgs-master { + inherit (final.stdenv.hostPlatform) system; + inherit (config.nixpkgs) config; + }; + }) +] diff --git a/overlays/default.nix b/overlays/default.nix deleted file mode 100644 index e33cc07..0000000 --- a/overlays/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - lib, - ... -}: -{ - flake.overlays = { - modifications = - final: prev: - lib.infuse prev { - cage.__output.patches.__append = [ ./cage-specify-output-name.patch ]; - bottles.__input.removeWarningPopup.__assign = true; - - easytier.__assign = final.stable.easytier; - - python314Packages.patool.__input.file.__output.postPatch.__append = - lib.warn "Remove `file` patch once https://github.com/NixOS/nixpkgs/pull/540742 is merged" '' - substituteInPlace src/landlock.c --replace-fail \ - "LANDLOCK_ACCESS_FS_READ_FILE | LANDLOCK_ACCESS_FS_READ_DIR" \ - "LANDLOCK_ACCESS_FS_READ_FILE | LANDLOCK_ACCESS_FS_READ_DIR | LANDLOCK_ACCESS_FS_EXECUTE" - ''; - }; - }; -} diff --git a/overlays/mautrix-telegram-use-importlib-resources.patch b/overlays/mautrix-telegram-use-importlib-resources.patch deleted file mode 100644 index bcacda1..0000000 --- a/overlays/mautrix-telegram-use-importlib-resources.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/mautrix_telegram/web/public/__init__.py b/mautrix_telegram/web/public/__init__.py -index cde3735..d911779 100644 ---- a/mautrix_telegram/web/public/__init__.py -+++ b/mautrix_telegram/web/public/__init__.py -@@ -23,7 +23,7 @@ import time - - from aiohttp import web - from mako.template import Template --import pkg_resources -+from importlib.resources import files - - from mautrix.types import UserID - from mautrix.util.signed_token import sign_token, verify_token -@@ -45,11 +45,11 @@ class PublicBridgeWebsite(AuthAPI): - self.secret_key = "".join(random.choices(string.ascii_lowercase + string.digits, k=64)) - - self.login = Template( -- pkg_resources.resource_string("mautrix_telegram", "web/public/login.html.mako") -+ files("mautrix_telegram").joinpath("web/public/login.html.mako").read_bytes() - ) - - self.mx_login = Template( -- pkg_resources.resource_string("mautrix_telegram", "web/public/matrix-login.html.mako") -+ files("mautrix_telegram").joinpath("web/public/matrix-login.html.mako").read_bytes() - ) - - self.app = web.Application(loop=loop) -@@ -58,7 +58,7 @@ class PublicBridgeWebsite(AuthAPI): - self.app.router.add_route("GET", "/matrix-login", self.get_matrix_login) - self.app.router.add_route("POST", "/matrix-login", self.post_matrix_login) - self.app.router.add_static( -- "/", pkg_resources.resource_filename("mautrix_telegram", "web/public/") -+ "/", str(files("mautrix_telegram").joinpath("web/public/")) - ) - - def make_token(self, mxid: str, endpoint: str = "/login", expires_in: int = 900) -> str: