From 01c1389c79a9afd06d0718e73e5fadc709fd7562 Mon Sep 17 00:00:00 2001 From: chn Date: Sun, 1 Jun 2025 11:06:46 +0800 Subject: [PATCH] flake: fix blog build --- flake.lock | 29 ++++++++++++++++--- flake.nix | 1 + flake/packages.nix | 1 - modules/system/nixpkgs/buildNixpkgsConfig.nix | 1 + packages/blog-buildproxy.nix | 17 +++++++++++ packages/default.nix | 6 +++- 6 files changed, 49 insertions(+), 6 deletions(-) create mode 100644 packages/blog-buildproxy.nix diff --git a/flake.lock b/flake.lock index d0d81b7a..d1c655c8 100644 --- a/flake.lock +++ b/flake.lock @@ -3,12 +3,12 @@ "blog": { "flake": false, "locked": { - "lastModified": 1748496213, + "lastModified": 1748747072, "lfs": true, - "narHash": "sha256-yoJ8G3ZmYu/qdDBckj/qz5ErOtpBlqHBqxMaL3ZTKuI=", + "narHash": "sha256-izrCxPYD8UEqJplL5bztdOGOxG7egdCgmXU6vaDDpGM=", "ref": "refs/heads/public", - "rev": "005a0715053936815c5e4be26236915d915d81c2", - "revCount": 29, + "rev": "a1f6487f8110df62d120114b8a88e84c94cf6278", + "revCount": 31, "type": "git", "url": "https://git.chn.moe/chn/blog-public.git" }, @@ -38,6 +38,26 @@ "type": "github" } }, + "buildproxy": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709212359, + "narHash": "sha256-La70ax79Hrp/Vz2G3gzI4fLgRd2z3lJrYLvCf+xcTj4=", + "owner": "polygon", + "repo": "nix-buildproxy", + "rev": "c26d73992ddae96812501b5ae1cc45037d8b10be", + "type": "github" + }, + "original": { + "owner": "polygon", + "repo": "nix-buildproxy", + "type": "github" + } + }, "catppuccin": { "inputs": { "nixpkgs": [ @@ -809,6 +829,7 @@ "inputs": { "blog": "blog", "bscpkgs": "bscpkgs", + "buildproxy": "buildproxy", "catppuccin": "catppuccin", "concurrencpp": "concurrencpp", "cppcoro": "cppcoro", diff --git a/flake.nix b/flake.nix index 02a0336b..648ce359 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,7 @@ catppuccin = { url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; bscpkgs = { url = "github:CHN-beta/bscpkgs"; inputs.nixpkgs.follows = "nixpkgs"; }; nixvirt = { url = "github:CHN-beta/NixVirt"; inputs.nixpkgs.follows = "nixpkgs"; }; + buildproxy = { url = "github:polygon/nix-buildproxy"; inputs.nixpkgs.follows = "nixpkgs"; }; misskey = { url = "git+https://github.com/CHN-beta/misskey?submodules=1"; flake = false; }; rsshub = { url = "github:DIYgod/RSSHub"; flake = false; }; diff --git a/flake/packages.nix b/flake/packages.nix index ae97c247..3b873217 100644 --- a/flake/packages.nix +++ b/flake/packages.nix @@ -23,7 +23,6 @@ version = inputs.self.rev or "dirty"; stdenv = pkgs.pkgsStatic.gcc14Stdenv; }; - inherit (pkgs.localPackages) blog; inherit (pkgs.localPackages.pkgsStatic) chn-bsub; vaspberry = pkgs.pkgsStatic.localPackages.vaspberry.override { diff --git a/modules/system/nixpkgs/buildNixpkgsConfig.nix b/modules/system/nixpkgs/buildNixpkgsConfig.nix index 6a2734fe..8e7c619f 100644 --- a/modules/system/nixpkgs/buildNixpkgsConfig.nix +++ b/modules/system/nixpkgs/buildNixpkgsConfig.nix @@ -35,6 +35,7 @@ in platformConfig // [ inputs.topInputs.nur-xddxdd.overlays.inSubTree inputs.topInputs.nix-vscode-extensions.overlays.default + inputs.topInputs.buildproxy.overlays.default (final: prev: { inherit (inputs.topInputs.nix-vscode-extensions.overlays.default final prev) nix-vscode-extensions; diff --git a/packages/blog-buildproxy.nix b/packages/blog-buildproxy.nix new file mode 100644 index 00000000..a4d58935 --- /dev/null +++ b/packages/blog-buildproxy.nix @@ -0,0 +1,17 @@ +{ fetchurl }: +[ + { + url = "https://cdn.jsdelivr.net/npm/flexsearch@0.8.143/dist/flexsearch.bundle.min.js"; + file = fetchurl + { + url = "https://cdn.jsdelivr.net/npm/flexsearch@0.8.143/dist/flexsearch.bundle.min.js"; + sha256 = "0k3g87h84s667m7zphlsaqzvkdka4rszq5pw66cvngjpi8d98gj3"; + }; + status_code = 200; + headers = + { + "content-type" = "application/javascript; charset=utf-8"; + "content-length" = "46087"; + }; + } +] diff --git a/packages/default.nix b/packages/default.nix index 7b854ed8..91b8835a 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -120,7 +120,11 @@ inputs: rec }; stickerpicker = inputs.pkgs.python3Packages.callPackage ./stickerpicker.nix { src = inputs.topInputs.stickerpicker; }; info = inputs.pkgs.callPackage ./info { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; }; - blog = inputs.pkgs.callPackage inputs.topInputs.blog { inherit (inputs.topInputs) hextra; }; + blog = inputs.pkgs.callPackage inputs.topInputs.blog + { + inherit (inputs.topInputs) hextra; + buildProxy = inputs.pkgs.lib.mkBuildproxy ./blog-buildproxy.nix; + }; phono3py = inputs.pkgs.python3Packages.callPackage ./phono3py.nix { src = inputs.topInputs.phono3py; }; vm = inputs.pkgs.callPackage ./vm { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; }; oneapiPackages = inputs.pkgs.lib.makeScope inputs.pkgs.newScope (final: