chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2024-10-22 23:39:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'misskey'

Browse Source
This commit is contained in:
陈浩南 2023-12-24 09:22:30 +08:00
commit 71c4426e53
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
local/pkgs/default.nix
View File

@ -4,7 +4,7 @@
vesta = callPackage ./vesta {}; vesta = callPackage ./vesta {};
oneapi = callPackage ./oneapi {}; oneapi = callPackage ./oneapi {};
rsshub = callPackage ./rsshub {}; rsshub = callPackage ./rsshub {};
misskey = callPackage ./misskey {}; misskey = callPackage ./misskey { nodejs = nodejs_21; };
mk-meili-mgn = callPackage ./mk-meili-mgn {}; mk-meili-mgn = callPackage ./mk-meili-mgn {};
# vasp = callPackage ./vasp # vasp = callPackage ./vasp
# { # {

17
local/pkgs/misskey/default.nix
View File

@ -1,27 +1,26 @@
{ {
lib, stdenv, mkPnpmPackage, fetchFromGitHub, fetchurl, nodejs_20, writeShellScript, buildFHSEnv, lib, stdenv, mkPnpmPackage, fetchFromGitHub, fetchurl, nodejs, writeShellScript, buildFHSEnv,
bash, cypress, vips, pkg-config bash, cypress, vips, pkg-config
}: }:
let let
pname = "misskey"; pname = "misskey";
version = "2023.11.1"; version = "2023.12.0";
src = fetchFromGitHub src = fetchFromGitHub
{ {
owner = "CHN-beta"; owner = "CHN-beta";
repo = "misskey"; repo = "misskey";
rev = "1e5134816cc23600a0448a62b34aadfe573c3bbc"; rev = "bec1dc37598b71c377643ee77330d4d6f7eb31f2";
sha256 = "ihkFVTpwEELmxAw4Lw01pWr8j6u2oLpfcw3laVUFCO4="; sha256 = "sha256-svLpG4xQ2mtsJ6gm+Ap8fZKTOl5V68XybGDvymsV4F4=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
originalPnpmPackage = mkPnpmPackage originalPnpmPackage = mkPnpmPackage
{ {
inherit pname version src; inherit pname version src nodejs;
nodejs = nodejs_20;
copyPnpmStore = true; copyPnpmStore = true;
}; };
startScript = writeShellScript "misskey" startScript = writeShellScript "misskey"
'' ''
export PATH=${lib.makeBinPath [ bash nodejs_20 nodejs_20.pkgs.pnpm nodejs_20.pkgs.gulp cypress ]}:$PATH export PATH=${lib.makeBinPath [ bash nodejs nodejs.pkgs.pnpm nodejs.pkgs.gulp cypress ]}:$PATH
export CYPRESS_RUN_BINARY="${cypress}/bin/Cypress" export CYPRESS_RUN_BINARY="${cypress}/bin/Cypress"
export NODE_ENV=production export NODE_ENV=production
pnpm run migrateandstart pnpm run migrateandstart
@ -79,7 +78,7 @@ in
inherit version src pname; inherit version src pname;
buildInputs = buildInputs =
[ [
bash nodejs_20 nodejs_20.pkgs.typescript nodejs_20.pkgs.pnpm nodejs_20.pkgs.gulp cypress vips pkg-config bash nodejs nodejs.pkgs.typescript nodejs.pkgs.pnpm nodejs.pkgs.gulp cypress vips pkg-config
]; ];
nativeBuildInputs = buildInputs; nativeBuildInputs = buildInputs;
CYPRESS_RUN_BINARY = "${cypress}/bin/Cypress"; CYPRESS_RUN_BINARY = "${cypress}/bin/Cypress";
@ -89,7 +88,7 @@ in
configurePhase = configurePhase =
'' ''
export HOME=$NIX_BUILD_TOP # Some packages need a writable HOME export HOME=$NIX_BUILD_TOP # Some packages need a writable HOME
export npm_config_nodedir=${nodejs_20} export npm_config_nodedir=${nodejs}
runHook preConfigure runHook preConfigure