diff --git a/flake.lock b/flake.lock index 9b9ee33f..2e5e62bc 100644 --- a/flake.lock +++ b/flake.lock @@ -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", diff --git a/flake.nix b/flake.nix index e7bb7c71..28520d18 100644 --- a/flake.nix +++ b/flake.nix @@ -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 diff --git a/flake/src.nix b/flake/src.nix index 9bdb5985..8d6a4746 100644 --- a/flake/src.nix +++ b/flake/src.nix @@ -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"; diff --git a/packages/default.nix b/packages/default.nix index f9ae4287..17f3eccc 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -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; }; diff --git a/packages/mirism-old.nix b/packages/mirism-old.nix index 69eadf46..4d28299a 100644 --- a/packages/mirism-old.nix +++ b/packages/mirism-old.nix @@ -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