From 9a36a1fc324b3a8b549acd7da15986c83ea9e0c7 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Fri, 28 Nov 2025 14:50:19 -0800 Subject: [PATCH 1/3] mecab: move to by-name/ --- pkgs/{tools/text => by-name/me}/mecab/base.nix | 0 pkgs/{tools/text => by-name/me}/mecab/ipadic.nix | 5 ++++- pkgs/{tools/text => by-name/me}/mecab/nodic.nix | 0 .../mecab/default.nix => by-name/me/mecab/package.nix} | 3 ++- pkgs/top-level/all-packages.nix | 10 ---------- 5 files changed, 6 insertions(+), 12 deletions(-) rename pkgs/{tools/text => by-name/me}/mecab/base.nix (100%) rename pkgs/{tools/text => by-name/me}/mecab/ipadic.nix (92%) rename pkgs/{tools/text => by-name/me}/mecab/nodic.nix (100%) rename pkgs/{tools/text/mecab/default.nix => by-name/me/mecab/package.nix} (91%) diff --git a/pkgs/tools/text/mecab/base.nix b/pkgs/by-name/me/mecab/base.nix similarity index 100% rename from pkgs/tools/text/mecab/base.nix rename to pkgs/by-name/me/mecab/base.nix diff --git a/pkgs/tools/text/mecab/ipadic.nix b/pkgs/by-name/me/mecab/ipadic.nix similarity index 92% rename from pkgs/tools/text/mecab/ipadic.nix rename to pkgs/by-name/me/mecab/ipadic.nix index 9f49e5f1b5e4..f32518fecb03 100644 --- a/pkgs/tools/text/mecab/ipadic.nix +++ b/pkgs/by-name/me/mecab/ipadic.nix @@ -2,10 +2,13 @@ lib, stdenv, fetchurl, - mecab-nodic, buildPackages, + callPackage, }: +let + mecab-nodic = callPackage ./nodic.nix { }; +in stdenv.mkDerivation (finalAttrs: { pname = "mecab-ipadic"; version = "2.7.0-20070801"; diff --git a/pkgs/tools/text/mecab/nodic.nix b/pkgs/by-name/me/mecab/nodic.nix similarity index 100% rename from pkgs/tools/text/mecab/nodic.nix rename to pkgs/by-name/me/mecab/nodic.nix diff --git a/pkgs/tools/text/mecab/default.nix b/pkgs/by-name/me/mecab/package.nix similarity index 91% rename from pkgs/tools/text/mecab/default.nix rename to pkgs/by-name/me/mecab/package.nix index 9cbf246aa615..1affb5bcd67a 100644 --- a/pkgs/tools/text/mecab/default.nix +++ b/pkgs/by-name/me/mecab/package.nix @@ -2,12 +2,13 @@ lib, stdenv, fetchurl, - mecab-ipadic, libiconv, + callPackage, }: let mecab-base = import ./base.nix { inherit fetchurl libiconv; }; + mecab-ipadic = callPackage ./ipadic.nix { }; in stdenv.mkDerivation ( finalAttrs: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b44a41637980..09c334697fe8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3330,16 +3330,6 @@ with pkgs; marimo = with python3Packages; toPythonApplication marimo; - mecab = - let - mecab-nodic = callPackage ../tools/text/mecab/nodic.nix { }; - in - callPackage ../tools/text/mecab { - mecab-ipadic = callPackage ../tools/text/mecab/ipadic.nix { - inherit mecab-nodic; - }; - }; - mbutil = python310Packages.callPackage ../applications/misc/mbutil { }; mcstatus = with python3Packages; toPythonApplication mcstatus; From 7439a857957508c9439037e6d7aa87ef0204abb5 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Fri, 28 Nov 2025 15:21:09 -0800 Subject: [PATCH 2/3] mecab: build base from source --- pkgs/by-name/me/mecab/base.nix | 12 +++++++----- pkgs/by-name/me/mecab/nodic.nix | 4 ++-- pkgs/by-name/me/mecab/package.nix | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/me/mecab/base.nix b/pkgs/by-name/me/mecab/base.nix index ea572104238c..e4270d04ceb6 100644 --- a/pkgs/by-name/me/mecab/base.nix +++ b/pkgs/by-name/me/mecab/base.nix @@ -1,12 +1,14 @@ -{ fetchurl, libiconv }: +{ fetchFromGitHub, libiconv }: finalAttrs: { version = "0.996"; - src = fetchurl { - url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE"; - name = "mecab-${finalAttrs.version}.tar.gz"; - hash = "sha256-4HMyV4MTW3LmZhRceBu0j62lg9UiT7JJD7bBQDumnFk="; + src = fetchFromGitHub { + owner = "taku910"; + repo = "mecab"; + rev = "5a7db65493a0b57d5fc31734e65300320aaf94c8"; + hash = "sha256-elB0Zr8DDkw3IZvvqVG+OBspZxFLPnvUSM9SRSILYWs="; + rootDir = "mecab"; }; buildInputs = [ libiconv ]; diff --git a/pkgs/by-name/me/mecab/nodic.nix b/pkgs/by-name/me/mecab/nodic.nix index 7dff23c6869a..905536d8270a 100644 --- a/pkgs/by-name/me/mecab/nodic.nix +++ b/pkgs/by-name/me/mecab/nodic.nix @@ -1,11 +1,11 @@ { stdenv, - fetchurl, + fetchFromGitHub, libiconv, }: let - mecab-base = import ./base.nix { inherit fetchurl libiconv; }; + mecab-base = import ./base.nix { inherit fetchFromGitHub libiconv; }; in stdenv.mkDerivation ( finalAttrs: diff --git a/pkgs/by-name/me/mecab/package.nix b/pkgs/by-name/me/mecab/package.nix index 1affb5bcd67a..271e73be5426 100644 --- a/pkgs/by-name/me/mecab/package.nix +++ b/pkgs/by-name/me/mecab/package.nix @@ -1,13 +1,13 @@ { lib, stdenv, - fetchurl, libiconv, callPackage, + fetchFromGitHub, }: let - mecab-base = import ./base.nix { inherit fetchurl libiconv; }; + mecab-base = import ./base.nix { inherit fetchFromGitHub libiconv; }; mecab-ipadic = callPackage ./ipadic.nix { }; in stdenv.mkDerivation ( From d8bcbb190b500922879f51e38622550ab96c9cc0 Mon Sep 17 00:00:00 2001 From: pancaek <20342389+pancaek@users.noreply.github.com> Date: Fri, 28 Nov 2025 16:56:00 -0800 Subject: [PATCH 3/3] mecab: build ipadic from source --- pkgs/by-name/me/mecab/ipadic.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/me/mecab/ipadic.nix b/pkgs/by-name/me/mecab/ipadic.nix index f32518fecb03..b3ecb078de31 100644 --- a/pkgs/by-name/me/mecab/ipadic.nix +++ b/pkgs/by-name/me/mecab/ipadic.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, buildPackages, callPackage, }: @@ -13,10 +13,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "mecab-ipadic"; version = "2.7.0-20070801"; - src = fetchurl { - url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7MWVlSDBCSXZMTXM"; - name = "mecab-ipadic-${finalAttrs.version}.tar.gz"; - hash = "sha256-ti9SfYgcUEV2uu2cbvZWFVRlixdc5q4AlqYDB+SeNSM="; + src = fetchFromGitHub { + owner = "taku910"; + repo = "mecab"; + rev = "2fd29256c6d5e1b10211cac838069ee9ede8c77a"; + hash = "sha256-FKRm4bIBhmE4gafg9JeMnpjXbAu4c7l7XIJVbnsRVi8="; + rootDir = "mecab-ipadic"; }; buildInputs = [ mecab-nodic ];