diff options
author | Felix Buehler <account@buehler.rocks> | 2021-11-29 19:24:13 +0100 |
---|---|---|
committer | Felix Buehler <account@buehler.rocks> | 2021-11-30 21:11:29 +0100 |
commit | 22dffe27f394427505d1c9006dcb6aebc6b9f85b (patch) | |
tree | 6a83be474c2b7aa0d3fa41cb572df841da3ea0c7 /pkgs/tools/text | |
parent | 4f6849f7c416bcaf48b349a33890d67713838ec1 (diff) | |
download | nixpkgs-22dffe27f394427505d1c9006dcb6aebc6b9f85b.tar nixpkgs-22dffe27f394427505d1c9006dcb6aebc6b9f85b.tar.gz nixpkgs-22dffe27f394427505d1c9006dcb6aebc6b9f85b.tar.bz2 nixpkgs-22dffe27f394427505d1c9006dcb6aebc6b9f85b.tar.lz nixpkgs-22dffe27f394427505d1c9006dcb6aebc6b9f85b.tar.xz nixpkgs-22dffe27f394427505d1c9006dcb6aebc6b9f85b.tar.zst nixpkgs-22dffe27f394427505d1c9006dcb6aebc6b9f85b.zip |
pkgs/tools: use pname&version instead of name
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/grin/default.nix | 5 | ||||
-rw-r--r-- | pkgs/tools/text/mecab/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/mecab/nodic.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/papertrail/default.nix | 3 | ||||
-rw-r--r-- | pkgs/tools/text/sgml/jade/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/smu/default.nix | 2 |
6 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index 5d89619001b..ceeed3d6f76 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -1,14 +1,13 @@ { lib, fetchFromGitHub, python2Packages }: python2Packages.buildPythonApplication rec { - program = "grin"; + pname = "grin"; version = "1.2.1"; - name = "${program}-${version}"; namePrefix = ""; src = fetchFromGitHub { owner = "rkern"; - repo = program; + repo = pname; rev = "8dd4b5309b3bc04fe9d3e71836420f7d8d4a293f"; sha256 = "0vz2aahwdcy1296g4w3i79dkvmzk9jc2n2zmlcvlg5m3s6h7b6jd"; }; diff --git a/pkgs/tools/text/mecab/default.nix b/pkgs/tools/text/mecab/default.nix index c579dcb8a17..04293d29efb 100644 --- a/pkgs/tools/text/mecab/default.nix +++ b/pkgs/tools/text/mecab/default.nix @@ -4,7 +4,8 @@ let mecab-base = import ./base.nix { inherit fetchurl; }; in stdenv.mkDerivation (mecab-base // { - name = "mecab-${mecab-base.version}"; + pname = "mecab"; + version = mecab-base.version; postInstall = '' sed -i 's|^dicdir = .*$|dicdir = ${mecab-ipadic}|' "$out/etc/mecabrc" diff --git a/pkgs/tools/text/mecab/nodic.nix b/pkgs/tools/text/mecab/nodic.nix index 1cbc31be4ee..be9003623e0 100644 --- a/pkgs/tools/text/mecab/nodic.nix +++ b/pkgs/tools/text/mecab/nodic.nix @@ -4,5 +4,6 @@ let mecab-base = import ./base.nix { inherit fetchurl; }; in stdenv.mkDerivation (mecab-base // { - name = "mecab-nodic-${mecab-base.version}"; + pname = "mecab-nodic"; + version = mecab-base.version; }) diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index c3d005a97e0..afc9d2d89e7 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -9,7 +9,8 @@ let gemset = ./gemset.nix; }; in stdenv.mkDerivation { - name = "papertrail-${(import ./gemset.nix).papertrail.version}"; + pname = "papertrail"; + version = (import ./gemset.nix).papertrail.version; dontUnpack = true; diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index c599375bc1c..b58b4c62947 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, gnum4 }: stdenv.mkDerivation rec { - name = "jade-${version}-${debpatch}"; + pname = "jade"; version = "1.2.1"; debpatch = "47.3"; diff --git a/pkgs/tools/text/smu/default.nix b/pkgs/tools/text/smu/default.nix index 854e70c7622..02a29a91f47 100644 --- a/pkgs/tools/text/smu/default.nix +++ b/pkgs/tools/text/smu/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "smu"; + pname = "smu"; version = "1.5"; src = fetchFromGitHub { |