diff --git a/pkgs/tools/text/bashblog/default.nix b/pkgs/tools/text/bashblog/default.nix index 3c8d90caf843..0080ed0f7e1c 100644 --- a/pkgs/tools/text/bashblog/default.nix +++ b/pkgs/tools/text/bashblog/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchzip , fetchFromGitHub , makeWrapper , substituteAll @@ -17,7 +16,7 @@ let markdownpl_path = "${perlPackages.TextMarkdown}/bin/Markdown.pl"; pandoc_path = "${pandoc}/bin/pandoc"; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation { pname = "bashblog"; version = "unstable-2022-03-26"; diff --git a/pkgs/tools/text/cmigemo/default.nix b/pkgs/tools/text/cmigemo/default.nix index 7b2598a9cfb2..179db9c337dd 100644 --- a/pkgs/tools/text/cmigemo/default.nix +++ b/pkgs/tools/text/cmigemo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, buildPackages +{ lib, stdenv, fetchFromGitHub , iconv, nkf, perl, which , skk-dicts }: diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix index e050c9939269..f8ff4adf5a4a 100644 --- a/pkgs/tools/text/gawk/gawkextlib.nix +++ b/pkgs/tools/text/gawk/gawkextlib.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, recurseIntoAttrs, fetchgit, writeText, pkg-config, autoreconfHook +{ lib, stdenv, recurseIntoAttrs, fetchgit, pkg-config, autoreconfHook , autoconf, automake, libiconv, libtool, texinfo, gettext, gawk, rapidjson, gd -, shapelib, libharu, lmdb, gmp, glibcLocales, mpfr, more, postgresql, hiredis -, expat, tre, makeWrapper }: +, libharu, lmdb, gmp, glibcLocales, mpfr, more, postgresql, hiredis +, expat, tre }: let buildExtension = lib.makeOverridable diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 1e339ee3e629..7559ef890ad2 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, glibcLocales, fetchurl, pcre2, libiconv, perl, autoreconfHook }: +{ lib, stdenv, glibcLocales, fetchurl, pcre2, libiconv, perl }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/tools/text/mdbook-graphviz/default.nix index 3660b4596901..cdba18e5b020 100644 --- a/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/pkgs/tools/text/mdbook-graphviz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, CoreServices, graphviz }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, graphviz }: rustPlatform.buildRustPackage rec { pname = "mdbook-graphviz"; diff --git a/pkgs/tools/text/mdbook-i18n-helpers/default.nix b/pkgs/tools/text/mdbook-i18n-helpers/default.nix index 1eebd0e85966..30b19076f94e 100644 --- a/pkgs/tools/text/mdbook-i18n-helpers/default.nix +++ b/pkgs/tools/text/mdbook-i18n-helpers/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , fetchFromGitHub , rustPlatform }: diff --git a/pkgs/tools/text/mdbook-plantuml/default.nix b/pkgs/tools/text/mdbook-plantuml/default.nix index e57bd1a45225..3e6d13d24489 100644 --- a/pkgs/tools/text/mdbook-plantuml/default.nix +++ b/pkgs/tools/text/mdbook-plantuml/default.nix @@ -3,10 +3,8 @@ , fetchpatch , stdenv , rustPlatform -, darwin , pkg-config , openssl -, libiconv , CoreServices }: diff --git a/pkgs/tools/text/morsel/default.nix b/pkgs/tools/text/morsel/default.nix index 3968eb2cc4a2..dc0fa9ef9b29 100644 --- a/pkgs/tools/text/morsel/default.nix +++ b/pkgs/tools/text/morsel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "morsel"; diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix index 49994d2dfa48..e64dbd367be5 100644 --- a/pkgs/tools/text/par/default.nix +++ b/pkgs/tools/text/par/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, fetchpatch}: +{lib, stdenv, fetchurl}: stdenv.mkDerivation rec { pname = "par"; diff --git a/pkgs/tools/text/sgml/linuxdoc-tools/default.nix b/pkgs/tools/text/sgml/linuxdoc-tools/default.nix index b39b4fd4f593..dad9975ebf12 100644 --- a/pkgs/tools/text/sgml/linuxdoc-tools/default.nix +++ b/pkgs/tools/text/sgml/linuxdoc-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, fetchFromGitLab, openjade, gnumake, perl, flex +{ stdenv, lib, makeWrapper, fetchFromGitLab, perl, flex , gnused, coreutils, which, opensp, groff, texlive, texinfo, withLatex ? false }: diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index 848bd5ce82eb..a88b94cf1d31 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, xmlto, docbook_xml_dtd_412 -, libxslt, docbook_xsl, autoconf, automake, gettext, libiconv, libtool +, docbook_xsl, autoconf, automake, libtool }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix index 7c7ddbb1b8ee..d15eff7f24b8 100644 --- a/pkgs/tools/text/txt2tags/default.nix +++ b/pkgs/tools/text/txt2tags/default.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchFromGitHub -, fetchpatch }: python3.pkgs.buildPythonApplication rec { diff --git a/pkgs/tools/text/ucg/default.nix b/pkgs/tools/text/ucg/default.nix index 5ecb9c747c48..e546a604252a 100644 --- a/pkgs/tools/text/ucg/default.nix +++ b/pkgs/tools/text/ucg/default.nix @@ -6,7 +6,7 @@ , pcre }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "ucg"; version = "unstable-2022-09-03"; @@ -57,5 +57,5 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.unix; broken = stdenv.isAarch64 || stdenv.isDarwin; }; -}) +} # TODO: report upstream diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index 829ea2c66eba..479cc0ff1115 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchsvn, fetchFromGitHub, fpc, openssl }: +{ lib, stdenv, fetchFromGitHub, fpc, openssl }: let flreSrc = fetchFromGitHub {