From 34aecb9cc297f110231259673bbe19e83b900b36 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 7 Jul 2025 17:05:54 +0800 Subject: [PATCH 1/6] misskey: add updateScript --- pkgs/by-name/mi/misskey/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 6fe2fe4d4be5..260f667de774 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -13,7 +13,7 @@ ffmpeg-headless, writeShellScript, xcbuild, - ... + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -123,6 +123,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit (finalAttrs) pnpmDeps; tests.misskey = nixosTests.misskey; + updateScript = nix-update-script { }; }; meta = { From 01be55fd3ad423338f7ea9d272c920be617f87f9 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 7 Jul 2025 17:06:56 +0800 Subject: [PATCH 2/6] misskey: replace rev with tag --- pkgs/by-name/mi/misskey/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 260f667de774..095be9b68dff 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "misskey-dev"; repo = "misskey"; - rev = finalAttrs.version; + tag = finalAttrs.version; hash = "sha256-uei5Ojx39kCbS8DCjHZ5PoEAsqJ5vC6SsFqIEIJ16n8="; fetchSubmodules = true; }; From bf2beb8ce9e0039d6412d6fb00b497e26c2cf94b Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 7 Jul 2025 17:07:21 +0800 Subject: [PATCH 3/6] misskey: 2024.11.0 -> 2025.6.3 --- pkgs/by-name/mi/misskey/package.nix | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 095be9b68dff..84a05592824e 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -3,7 +3,6 @@ lib, nixosTests, fetchFromGitHub, - fetchpatch, nodejs, pnpm_9, makeWrapper, @@ -18,26 +17,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "misskey"; - - version = "2024.11.0"; + version = "2025.6.3"; src = fetchFromGitHub { owner = "misskey-dev"; repo = "misskey"; tag = finalAttrs.version; - hash = "sha256-uei5Ojx39kCbS8DCjHZ5PoEAsqJ5vC6SsFqIEIJ16n8="; + hash = "sha256-6UZcIZlfcYcQgjR/jrNhsoLNQGml2tjK3LYLI0fdgMU="; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - # https://github.com/misskey-dev/misskey/security/advisories/GHSA-w98m-j6hq-cwjm - name = "CVE-2025-24896.patch"; - url = "https://github.com/misskey-dev/misskey/commit/ba9f295ef2bf31cc90fa587e20b9a7655b7a1824.patch"; - hash = "sha256-jNl2AdLaG3v8QB5g/UPTupdyP1yGR0WcWull7EA7ogs="; - }) - ]; - nativeBuildInputs = [ nodejs pnpm_9.configHook @@ -48,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-YWZhm5eKjB6JGP45WC3UrIkr7vuBUI4Q3oiK8Lst3dI="; + hash = "sha256-T8LwpEjeWNmkIo3Dn1BCFHBsTzA/Dt6/pk/NMtvT0N4="; }; buildPhase = '' From 0354d1ca91db3b158302ac62542bc9030a5e5bdd Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 7 Jul 2025 17:27:35 +0800 Subject: [PATCH 4/6] misskey: fix description --- pkgs/by-name/mi/misskey/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 84a05592824e..50058b133fcc 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - description = "🌎 An interplanetary microblogging platform 🚀"; + description = "Open source, federated social media platform"; homepage = "https://misskey-hub.net/"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.feathecutie ]; From 3e4f4983dae47be58ce10225e4b8d2bb15d2fb36 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Mon, 7 Jul 2025 17:28:01 +0800 Subject: [PATCH 5/6] misskey: add ngi team --- pkgs/by-name/mi/misskey/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 50058b133fcc..feae6029c35f 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -120,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://misskey-hub.net/"; license = lib.licenses.agpl3Only; maintainers = [ lib.maintainers.feathecutie ]; + teams = [ lib.teams.ngi ]; platforms = lib.platforms.unix; mainProgram = "misskey"; }; From e59d664fa3a5906c583a6aafd5c415fd5eb57728 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Wed, 9 Jul 2025 22:43:12 +0800 Subject: [PATCH 6/6] misskey: fix build on darwin --- pkgs/by-name/mi/misskey/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index feae6029c35f..0cabaa810bbf 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { pnpm_9.configHook makeWrapper python3 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild.xcrun ]; + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; # https://nixos.org/manual/nixpkgs/unstable/#javascript-pnpm pnpmDeps = pnpm_9.fetchDeps {