flake: fix blog build

This commit is contained in:
2025-06-01 11:06:46 +08:00
parent 2c76ca9425
commit 01c1389c79
6 changed files with 49 additions and 6 deletions

29
flake.lock generated
View File

@@ -3,12 +3,12 @@
"blog": { "blog": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748496213, "lastModified": 1748747072,
"lfs": true, "lfs": true,
"narHash": "sha256-yoJ8G3ZmYu/qdDBckj/qz5ErOtpBlqHBqxMaL3ZTKuI=", "narHash": "sha256-izrCxPYD8UEqJplL5bztdOGOxG7egdCgmXU6vaDDpGM=",
"ref": "refs/heads/public", "ref": "refs/heads/public",
"rev": "005a0715053936815c5e4be26236915d915d81c2", "rev": "a1f6487f8110df62d120114b8a88e84c94cf6278",
"revCount": 29, "revCount": 31,
"type": "git", "type": "git",
"url": "https://git.chn.moe/chn/blog-public.git" "url": "https://git.chn.moe/chn/blog-public.git"
}, },
@@ -38,6 +38,26 @@
"type": "github" "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": { "catppuccin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -809,6 +829,7 @@
"inputs": { "inputs": {
"blog": "blog", "blog": "blog",
"bscpkgs": "bscpkgs", "bscpkgs": "bscpkgs",
"buildproxy": "buildproxy",
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"concurrencpp": "concurrencpp", "concurrencpp": "concurrencpp",
"cppcoro": "cppcoro", "cppcoro": "cppcoro",

View File

@@ -27,6 +27,7 @@
catppuccin = { url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; catppuccin = { url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; };
bscpkgs = { url = "github:CHN-beta/bscpkgs"; inputs.nixpkgs.follows = "nixpkgs"; }; bscpkgs = { url = "github:CHN-beta/bscpkgs"; inputs.nixpkgs.follows = "nixpkgs"; };
nixvirt = { url = "github:CHN-beta/NixVirt"; 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; }; misskey = { url = "git+https://github.com/CHN-beta/misskey?submodules=1"; flake = false; };
rsshub = { url = "github:DIYgod/RSSHub"; flake = false; }; rsshub = { url = "github:DIYgod/RSSHub"; flake = false; };

View File

@@ -23,7 +23,6 @@
version = inputs.self.rev or "dirty"; version = inputs.self.rev or "dirty";
stdenv = pkgs.pkgsStatic.gcc14Stdenv; stdenv = pkgs.pkgsStatic.gcc14Stdenv;
}; };
inherit (pkgs.localPackages) blog;
inherit (pkgs.localPackages.pkgsStatic) chn-bsub; inherit (pkgs.localPackages.pkgsStatic) chn-bsub;
vaspberry = pkgs.pkgsStatic.localPackages.vaspberry.override vaspberry = pkgs.pkgsStatic.localPackages.vaspberry.override
{ {

View File

@@ -35,6 +35,7 @@ in platformConfig //
[ [
inputs.topInputs.nur-xddxdd.overlays.inSubTree inputs.topInputs.nur-xddxdd.overlays.inSubTree
inputs.topInputs.nix-vscode-extensions.overlays.default inputs.topInputs.nix-vscode-extensions.overlays.default
inputs.topInputs.buildproxy.overlays.default
(final: prev: (final: prev:
{ {
inherit (inputs.topInputs.nix-vscode-extensions.overlays.default final prev) nix-vscode-extensions; inherit (inputs.topInputs.nix-vscode-extensions.overlays.default final prev) nix-vscode-extensions;

View File

@@ -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";
};
}
]

View File

@@ -120,7 +120,11 @@ inputs: rec
}; };
stickerpicker = inputs.pkgs.python3Packages.callPackage ./stickerpicker.nix { src = inputs.topInputs.stickerpicker; }; stickerpicker = inputs.pkgs.python3Packages.callPackage ./stickerpicker.nix { src = inputs.topInputs.stickerpicker; };
info = inputs.pkgs.callPackage ./info { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; }; 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; }; phono3py = inputs.pkgs.python3Packages.callPackage ./phono3py.nix { src = inputs.topInputs.phono3py; };
vm = inputs.pkgs.callPackage ./vm { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; }; vm = inputs.pkgs.callPackage ./vm { inherit biu; stdenv = inputs.pkgs.clang18Stdenv; };
oneapiPackages = inputs.pkgs.lib.makeScope inputs.pkgs.newScope (final: oneapiPackages = inputs.pkgs.lib.makeScope inputs.pkgs.newScope (final: