fix lock file, fix mirism build

This commit is contained in:
2025-10-04 12:07:34 +08:00
parent 0be4b8f782
commit 6df8681fe1
5 changed files with 43 additions and 15 deletions

38
flake.lock generated
View File

@@ -642,6 +642,22 @@
"type": "github"
}
},
"mirism-old": {
"flake": false,
"locked": {
"lastModified": 1759545870,
"narHash": "sha256-gNV2P02jMyP+6FFpr8FvJpjhYiTdd2J5Yjlb2qt5Xlg=",
"owner": "CHN-beta",
"repo": "mirism-old-public",
"rev": "3cb635b0933930867c18b84563e97346c7ef4833",
"type": "github"
},
"original": {
"owner": "CHN-beta",
"repo": "mirism-old-public",
"type": "github"
}
},
"misskey": {
"flake": false,
"locked": {
@@ -1316,6 +1332,27 @@
"url": "https://github.com/dean0x7d/pybinding"
}
},
"quickshell": {
"inputs": {
"nixpkgs": [
"dankmaterialshell",
"nixpkgs"
]
},
"locked": {
"lastModified": 1756981260,
"narHash": "sha256-GhuD9QVimjynHI0OOyZsqJsnlXr2orowh9H+HYz4YMs=",
"ref": "refs/heads/master",
"rev": "6eb12551baf924f8fdecdd04113863a754259c34",
"revCount": 672,
"type": "git",
"url": "https://git.outfoxxed.me/quickshell/quickshell"
},
"original": {
"type": "git",
"url": "https://git.outfoxxed.me/quickshell/quickshell"
}
},
"root": {
"inputs": {
"aagl": "aagl",
@@ -1336,6 +1373,7 @@
"lepton": "lepton",
"mac-style": "mac-style",
"matplotplusplus": "matplotplusplus",
"mirism-old": "mirism-old",
"misskey": "misskey",
"mumax": "mumax",
"nameof": "nameof",

View File

@@ -67,6 +67,7 @@
speedtest = { url = "github:librespeed/speedtest"; flake = false; };
pybinding = { url = "git+https://github.com/dean0x7d/pybinding?submodules=1"; flake = false; };
brokenaxes = { url = "github:bendichter/brokenaxes"; flake = false; };
mirism-old = { url = "github:CHN-beta/mirism-old-public"; flake = false; };
};
outputs = inputs: let localLib = import ./flake/lib inputs.nixpkgs.lib; in

View File

@@ -124,14 +124,6 @@
sha256 = "Tq4AzQgde2KIWKA1k6JlxvdphGG9JluHMZjVw0fBUeQ=";
};
};
# nix-store --query --hash $(nix store add-path . --name 'mirism')
mirism-old = pkgs.requireFile
{
name = "mirism";
sha256 = "1zhhzwi325g21kqdip7zzw1i9b354h1wpzd4zhzb1ql9kjdh87q3";
hashMode = "recursive";
message = "Source file not found.";
};
pslist =
{
version = "1.4.0";

View File

@@ -23,14 +23,11 @@ inputs: rec
nameof = inputs.pkgs.callPackage ./nameof.nix { src = inputs.topInputs.nameof; };
pslist = inputs.pkgs.callPackage ./pslist.nix { src = inputs.topInputs.self.src.pslist; };
tgbot-cpp = inputs.pkgs.callPackage ./tgbot-cpp.nix { src = inputs.topInputs.tgbot-cpp; };
mirism-old = inputs.pkgs.callPackage ./mirism-old.nix
mirism-old = inputs.pkgs.pkgs-2305.callPackage ./mirism-old.nix
{
inherit cppcoro nameof date;
inherit (inputs.pkgs.pkgs-2305) boost;
src = inputs.topInputs.self.src.mirism-old;
src = inputs.topInputs.mirism-old;
nghttp2 = inputs.pkgs.pkgs-2305.nghttp2.override { enableAsioLib = true; };
stdenv = inputs.pkgs.pkgs-2305.stdenv;
tgbot-cpp = tgbot-cpp.override { inherit (inputs.pkgs.pkgs-2305) stdenv; };
};
cppcoro = inputs.pkgs.callPackage ./cppcoro { src = inputs.topInputs.cppcoro; };
date = inputs.pkgs.callPackage ./date.nix { src = inputs.topInputs.date; };

View File

@@ -1,11 +1,11 @@
{
lib, stdenv, requireFile, src,
boost, nghttp2, brotli, nameof, cppcoro, tgbot-cpp, libbacktrace, fmt, date
boost, nghttp2, brotli, nameof, cppcoro, libbacktrace, fmt, date, openssl
}: stdenv.mkDerivation
{
name = "mirism";
inherit src;
buildInputs = [ boost nghttp2.dev brotli nameof cppcoro tgbot-cpp libbacktrace fmt date ];
buildInputs = [ boost nghttp2 brotli nameof cppcoro libbacktrace fmt date openssl ];
buildPhase =
''
runHook preBuild