diff --git a/pkgs/tools/text/mecab/base.nix b/pkgs/by-name/me/mecab/base.nix similarity index 57% rename from pkgs/tools/text/mecab/base.nix rename to pkgs/by-name/me/mecab/base.nix index ea572104238c..e4270d04ceb6 100644 --- a/pkgs/tools/text/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/tools/text/mecab/ipadic.nix b/pkgs/by-name/me/mecab/ipadic.nix similarity index 65% rename from pkgs/tools/text/mecab/ipadic.nix rename to pkgs/by-name/me/mecab/ipadic.nix index 9f49e5f1b5e4..b3ecb078de31 100644 --- a/pkgs/tools/text/mecab/ipadic.nix +++ b/pkgs/by-name/me/mecab/ipadic.nix @@ -1,19 +1,24 @@ { lib, stdenv, - fetchurl, - mecab-nodic, + fetchFromGitHub, buildPackages, + callPackage, }: +let + mecab-nodic = callPackage ./nodic.nix { }; +in 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 ]; diff --git a/pkgs/tools/text/mecab/nodic.nix b/pkgs/by-name/me/mecab/nodic.nix similarity index 62% rename from pkgs/tools/text/mecab/nodic.nix rename to pkgs/by-name/me/mecab/nodic.nix index 7dff23c6869a..905536d8270a 100644 --- a/pkgs/tools/text/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/tools/text/mecab/default.nix b/pkgs/by-name/me/mecab/package.nix similarity index 79% rename from pkgs/tools/text/mecab/default.nix rename to pkgs/by-name/me/mecab/package.nix index 9cbf246aa615..271e73be5426 100644 --- a/pkgs/tools/text/mecab/default.nix +++ b/pkgs/by-name/me/mecab/package.nix @@ -1,13 +1,14 @@ { lib, stdenv, - fetchurl, - mecab-ipadic, 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 ( 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;