diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-06-04 13:31:26 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-06-04 13:31:26 +0100 |
| commit | f27b3096c37e5a90e3415074bc489c39116a99b6 (patch) | |
| tree | c259ea73368fcb7eb4b73511a245cd583122ab1e /pkgs/tools/text | |
| parent | 765c5edfb6861a4001ef5e1478fa5a32f1593b0e (diff) | |
| parent | 50a127f8fccd0d24712c8ab146ca251f27cc4cb0 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/os-specific/linux/util-linux/default.nix
Diffstat (limited to 'pkgs/tools/text')
| -rw-r--r-- | pkgs/tools/text/groff/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/text/tesh/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index df06292c4f3ef..6e10144bb587c 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, perl +{ lib, stdenv, fetchurl, perl , enableGhostscript ? false , ghostscript, gawk, libX11, libXaw, libXt, libXmu # for postscript and html output , enableHtml ? false, psutils, netpbm # for html output diff --git a/pkgs/tools/text/tesh/default.nix b/pkgs/tools/text/tesh/default.nix index abff7771add23..d4d2c1e0ed714 100644 --- a/pkgs/tools/text/tesh/default.nix +++ b/pkgs/tools/text/tesh/default.nix @@ -1,4 +1,4 @@ -{ python3Packages, fetchFromGitHub, fetchpatch }: +{ python3Packages, fetchFromGitHub }: let version = "0.3.2"; |