From 2dc854ee20a1c6e638f25d7b1edc4cfda0a443fd Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 30 Aug 2025 16:01:13 +0900 Subject: [PATCH 1/3] moralerspace-nf: remove --- pkgs/by-name/mo/moralerspace-nf/package.nix | 28 --------------------- pkgs/by-name/mo/moralerspace/package.nix | 4 --- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 pkgs/by-name/mo/moralerspace-nf/package.nix diff --git a/pkgs/by-name/mo/moralerspace-nf/package.nix b/pkgs/by-name/mo/moralerspace-nf/package.nix deleted file mode 100644 index b552eb036f5f..000000000000 --- a/pkgs/by-name/mo/moralerspace-nf/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchzip, - moralerspace, -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "moralerspace-nf"; - inherit (moralerspace) version meta; - - src = fetchzip { - url = "https://github.com/yuru7/moralerspace/releases/download/v${finalAttrs.version}/MoralerspaceNF_v${finalAttrs.version}.zip"; - hash = "sha256-zpJ6I/4WMiVfDbowcvw1JAup0RdvylJCzQbwa5qWM44="; - }; - - installPhase = '' - runHook preInstall - - install -Dm644 *.ttf -t $out/share/fonts/moralerspace-nf - - runHook postInstall - ''; - - passthru = { - inherit (moralerspace) updateScript; - }; -}) diff --git a/pkgs/by-name/mo/moralerspace/package.nix b/pkgs/by-name/mo/moralerspace/package.nix index baaf309226cb..affa19c7da33 100644 --- a/pkgs/by-name/mo/moralerspace/package.nix +++ b/pkgs/by-name/mo/moralerspace/package.nix @@ -41,10 +41,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { attrPath = "moralerspace-jpdoc"; extraArgs = [ "--version=skip" ]; }) - (nix-update-script { - attrPath = "moralerspace-nf"; - extraArgs = [ "--version=skip" ]; - }) ]; meta = { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ec6633dcd4c9..43529ad4e4a4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1587,6 +1587,7 @@ mapAliases { mongodb-4_4 = throw "mongodb-4_4 has been removed, it's end of life since April 2024"; # Added 2024-04-11 mongodb-5_0 = throw "mongodb-5_0 has been removed, it's end of life since October 2024"; # Added 2024-10-01 mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23 + moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30 moz-phab = mozphab; # Added 2022-08-09 mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14 mp3splt = throw "'mp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 From fa8a1ad94795990111eedcd9471c9eb19b70d090 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 30 Aug 2025 16:02:07 +0900 Subject: [PATCH 2/3] moralerspace-hwnf: remove --- pkgs/by-name/mo/moralerspace-hwnf/package.nix | 28 ------------------- pkgs/by-name/mo/moralerspace/package.nix | 4 --- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 pkgs/by-name/mo/moralerspace-hwnf/package.nix diff --git a/pkgs/by-name/mo/moralerspace-hwnf/package.nix b/pkgs/by-name/mo/moralerspace-hwnf/package.nix deleted file mode 100644 index 39615f9b8eb3..000000000000 --- a/pkgs/by-name/mo/moralerspace-hwnf/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchzip, - moralerspace, -}: - -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "moralerspace-hwnf"; - inherit (moralerspace) version meta; - - src = fetchzip { - url = "https://github.com/yuru7/moralerspace/releases/download/v${finalAttrs.version}/MoralerspaceHWNF_v${finalAttrs.version}.zip"; - hash = "sha256-XRdDcfgwbP5g26xh9rlHRp9i//k5PdRhMExMy3ibN/4="; - }; - - installPhase = '' - runHook preInstall - - install -Dm644 *.ttf -t $out/share/fonts/moralerspace-hwnf - - runHook postInstall - ''; - - passthru = { - inherit (moralerspace) updateScript; - }; -}) diff --git a/pkgs/by-name/mo/moralerspace/package.nix b/pkgs/by-name/mo/moralerspace/package.nix index affa19c7da33..29e1c399a7fe 100644 --- a/pkgs/by-name/mo/moralerspace/package.nix +++ b/pkgs/by-name/mo/moralerspace/package.nix @@ -33,10 +33,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { attrPath = "moralerspace-hwjpdoc"; extraArgs = [ "--version=skip" ]; }) - (nix-update-script { - attrPath = "moralerspace-hwnf"; - extraArgs = [ "--version=skip" ]; - }) (nix-update-script { attrPath = "moralerspace-jpdoc"; extraArgs = [ "--version=skip" ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 43529ad4e4a4..1fedab255848 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1588,6 +1588,7 @@ mapAliases { mongodb-5_0 = throw "mongodb-5_0 has been removed, it's end of life since October 2024"; # Added 2024-10-01 mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23 moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30 + moralerspace-hwnf = throw "moralerspace-hwnf has been removed, use moralerspace-hw instead."; # Added 2025-08-30 moz-phab = mozphab; # Added 2022-08-09 mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14 mp3splt = throw "'mp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17 From 4f8fb005d257b608a77b980cd280a511b53c91f9 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 30 Aug 2025 16:03:02 +0900 Subject: [PATCH 3/3] moralerspace: 1.1.0 -> 2.0.0 Changelog: https://github.com/yuru7/moralerspace/releases/tag/v2.0.0 --- pkgs/by-name/mo/moralerspace-hw/package.nix | 2 +- pkgs/by-name/mo/moralerspace-hwjpdoc/package.nix | 2 +- pkgs/by-name/mo/moralerspace-jpdoc/package.nix | 2 +- pkgs/by-name/mo/moralerspace/package.nix | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/mo/moralerspace-hw/package.nix b/pkgs/by-name/mo/moralerspace-hw/package.nix index 4438c390136a..c65121dec1c4 100644 --- a/pkgs/by-name/mo/moralerspace-hw/package.nix +++ b/pkgs/by-name/mo/moralerspace-hw/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchzip { url = "https://github.com/yuru7/moralerspace/releases/download/v${finalAttrs.version}/MoralerspaceHW_v${finalAttrs.version}.zip"; - hash = "sha256-V02Lp7bWKjUGhFJ5fOTVrk74ei0T5UtITQeHZ4OHytw="; + hash = "sha256-gd195o0acZL8AhGvcLLQYxd1VWvUYjpVRMOT5D7zDME="; }; installPhase = '' diff --git a/pkgs/by-name/mo/moralerspace-hwjpdoc/package.nix b/pkgs/by-name/mo/moralerspace-hwjpdoc/package.nix index ad5938447a3f..1f2a7bffc05f 100644 --- a/pkgs/by-name/mo/moralerspace-hwjpdoc/package.nix +++ b/pkgs/by-name/mo/moralerspace-hwjpdoc/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchzip { url = "https://github.com/yuru7/moralerspace/releases/download/v${finalAttrs.version}/MoralerspaceHWJPDOC_v${finalAttrs.version}.zip"; - hash = "sha256-rYDx3MMjxnmp/o6nRc5/bIEkwvMP9gmwm6R//3KwoLk="; + hash = "sha256-t8dp+SwndHxBA5YE2TYTWP6x3MgczbMXQ6oNvMD0ycU="; }; installPhase = '' diff --git a/pkgs/by-name/mo/moralerspace-jpdoc/package.nix b/pkgs/by-name/mo/moralerspace-jpdoc/package.nix index 66897d80990e..538c2d8497ad 100644 --- a/pkgs/by-name/mo/moralerspace-jpdoc/package.nix +++ b/pkgs/by-name/mo/moralerspace-jpdoc/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchzip { url = "https://github.com/yuru7/moralerspace/releases/download/v${finalAttrs.version}/MoralerspaceJPDOC_v${finalAttrs.version}.zip"; - hash = "sha256-oeTRnDSp9sbicMmaybX7xue1u7dSpAqUv8XTOUrzEjE="; + hash = "sha256-FDiWiqIAFoiA1SFCv7ff5kCfPcKTbSxxGBWHOljQYVg="; }; installPhase = '' diff --git a/pkgs/by-name/mo/moralerspace/package.nix b/pkgs/by-name/mo/moralerspace/package.nix index 29e1c399a7fe..a4422078e7d0 100644 --- a/pkgs/by-name/mo/moralerspace/package.nix +++ b/pkgs/by-name/mo/moralerspace/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "moralerspace"; - version = "1.1.0"; + version = "2.0.0"; src = fetchzip { url = "https://github.com/yuru7/moralerspace/releases/download/v${finalAttrs.version}/Moralerspace_v${finalAttrs.version}.zip"; - hash = "sha256-sItgkidfmOPKtMx8+eaVFn8hK9cRxYShIsNXTh5dJfk="; + hash = "sha256-RWpJt59Yvt/nhu6xeyR3eJKRaw+477ZXAPztt7Clt7Q="; }; installPhase = ''