From 458507324d66da2b52bcc3ae3c39094441075ca7 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 2 Jun 2025 21:29:38 -0400 Subject: [PATCH 1/3] ted: enable on darwin Signed-off-by: Ihar Hrachyshka --- pkgs/by-name/te/ted/package.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix index b8da10b305da..cf78bc44881a 100644 --- a/pkgs/by-name/te/ted/package.nix +++ b/pkgs/by-name/te/ted/package.nix @@ -9,10 +9,11 @@ libjpeg, libtiff, libpng, - gtk2, + gtk2-x11, libpaper, makeWrapper, ghostscript, + libXft, }: stdenv.mkDerivation rec { @@ -56,6 +57,8 @@ stdenv.mkDerivation rec { "compile.shared" ]; + env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv"; + installPhase = '' runHook preInstall @@ -91,8 +94,9 @@ stdenv.mkDerivation rec { libjpeg libtiff libpng - gtk2 + gtk2-x11 libpaper + libXft ]; meta = with lib; { @@ -112,7 +116,6 @@ stdenv.mkDerivation rec { homepage = "https://nllgg.nl/Ted/"; license = licenses.gpl2Only; platforms = platforms.all; - broken = stdenv.hostPlatform.isDarwin; maintainers = with maintainers; [ obadz ]; }; } From 3265b95424400747466ffb79cce164ee4e5698e4 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 2 Jun 2025 21:32:44 -0400 Subject: [PATCH 2/3] ted: modernize Signed-off-by: Ihar Hrachyshka --- pkgs/by-name/te/ted/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix index cf78bc44881a..a626f8812265 100644 --- a/pkgs/by-name/te/ted/package.nix +++ b/pkgs/by-name/te/ted/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.nluug.nl/pub/editors/${pname}/${pname}-${version}.src.tar.gz"; - sha256 = "0v1ipynyjklb3chd1vq26a21sjjg66sir57gi2kkrbwnpk195a9z"; + hash = "sha256-P6mSwryWrzyniO+UHLUxT0odhDIC79AgG4tO6a2/MWw="; }; preConfigure = '' @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { libXft ]; - meta = with lib; { + meta = { description = "Easy rich text processor"; longDescription = '' Ted is a text processor running under X Windows on Unix/Linux systems. @@ -114,8 +114,8 @@ stdenv.mkDerivation rec { Acrobat PDF converter. ''; homepage = "https://nllgg.nl/Ted/"; - license = licenses.gpl2Only; - platforms = platforms.all; - maintainers = with maintainers; [ obadz ]; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ obadz ]; }; } From 86710a779c0cb90c2a844055c693856e78cfc110 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Sun, 10 Aug 2025 17:56:00 -0400 Subject: [PATCH 3/3] ted: fix homepage --- pkgs/by-name/te/ted/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/te/ted/package.nix b/pkgs/by-name/te/ted/package.nix index a626f8812265..eaa5c5a373d8 100644 --- a/pkgs/by-name/te/ted/package.nix +++ b/pkgs/by-name/te/ted/package.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { MS-Word. Additionally, Ted also is an RTF to PostScript and an RTF to Acrobat PDF converter. ''; - homepage = "https://nllgg.nl/Ted/"; + homepage = "https://ftp.nluug.nl/pub/editors/ted/"; license = lib.licenses.gpl2Only; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ obadz ];