Merge pull request #243099 from figsoda/text

pkgs/tools/text: remove dead code
2023-07-12 19:52:47 +01:00
parent f278beca3a d70e0242e9
commit 1936e818e6
14 changed files with 14 additions and 19 deletions
@@ -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";

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, buildPackages
+{ lib, stdenv, fetchFromGitHub
 , iconv, nkf, perl, which
 , skk-dicts
 }:
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform, CoreServices, graphviz }:
+{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, graphviz }:

 rustPlatform.buildRustPackage rec {
  pname = "mdbook-graphviz";
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , fetchFromGitHub
 , rustPlatform
 }:
@@ -3,10 +3,8 @@
 , fetchpatch
 , stdenv
 , rustPlatform
-, darwin
 , pkg-config
 , openssl
-, libiconv
 , CoreServices
 }:

@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, rustPlatform }:
+{ lib, rustPlatform, fetchFromGitHub }:

 rustPlatform.buildRustPackage rec {
  pname = "morsel";
@@ -1,4 +1,4 @@
-{lib, stdenv, fetchurl, fetchpatch}:
+{lib, stdenv, fetchurl}:

 stdenv.mkDerivation rec {
  pname = "par";
@@ -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
 }:

@@ -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 {
@@ -1,7 +1,6 @@
 { lib
 , python3
 , fetchFromGitHub
-, fetchpatch
 }:

 python3.pkgs.buildPythonApplication rec {
@@ -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
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchsvn, fetchFromGitHub, fpc, openssl }:
+{ lib, stdenv, fetchFromGitHub, fpc, openssl }:

 let
  flreSrc = fetchFromGitHub {