From 992bd81dd75aa94e93569c492c6480769b927920 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Sun, 18 May 2025 13:40:01 +0200 Subject: [PATCH] edbrowse: drop Unmaintained in Nixpkgs for 3 years --- .../ed/edbrowse/0001-small-fixes.patch | 20 ---- pkgs/by-name/ed/edbrowse/package.nix | 102 ------------------ pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 122 deletions(-) delete mode 100644 pkgs/by-name/ed/edbrowse/0001-small-fixes.patch delete mode 100644 pkgs/by-name/ed/edbrowse/package.nix diff --git a/pkgs/by-name/ed/edbrowse/0001-small-fixes.patch b/pkgs/by-name/ed/edbrowse/0001-small-fixes.patch deleted file mode 100644 index 433b884cc5de..000000000000 --- a/pkgs/by-name/ed/edbrowse/0001-small-fixes.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur source.old/src/makefile source/src/makefile ---- source.old/src/makefile 1969-12-31 21:00:01.000000000 -0300 -+++ source/src/makefile 2021-06-07 18:58:48.851231787 -0300 -@@ -101,14 +101,14 @@ - - # need packages nodejs and libnode-dev - js_hello_v8 : js_hello_v8.cpp -- g++ -I/usr/include/v8 js_hello_v8.cpp -lv8 -lstdc++ -o js_hello_v8 -+ $(CXX) -I/usr/include/v8 js_hello_v8.cpp -lv8 -lstdc++ -o js_hello_v8 - - HELLOEXTRA = stringfile.o messages.o msg-strings.o startwindow.o ebrc.o format.o http.o isup.o fetchmail.o sendmail.o plugin.o buffers.o dbstubs.o html.o decorate.o html-tidy.o css.o - js_hello_moz : js_hello_moz.o $(HELLOEXTRA) jseng-moz.o - $(CC) js_hello_moz.o $(HELLOEXTRA) jseng-moz.o $(LDFLAGS) -lmozjs-$(SMV) -lstdc++ -o $@ - - js_hello_quick : js_hello_quick.c -- gcc $(CFLAGS) js_hello_quick.c stringfile.o messages.o msg-strings.o ebrc.o format.o -o js_hello_quick -L/usr/local/lib/quickjs -lquickjs -lm -ldl -lpthread -latomic -+ $(CC) $(CFLAGS) js_hello_quick.c stringfile.o messages.o msg-strings.o ebrc.o format.o -o js_hello_quick $(QUICKJS_LDFLAGS) -lm -lpthread - - hello: js_hello_duk js_hello_v8 js_hello_moz js_hello_quick - diff --git a/pkgs/by-name/ed/edbrowse/package.nix b/pkgs/by-name/ed/edbrowse/package.nix deleted file mode 100644 index a2bd5f4847c1..000000000000 --- a/pkgs/by-name/ed/edbrowse/package.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ - lib, - curl, - duktape, - fetchFromGitHub, - html-tidy, - openssl, - pcre, - perl, - pkg-config, - quickjs, - readline, - stdenv, - unixODBC, - which, - withODBC ? true, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "edbrowse"; - version = "3.8.0"; - - src = fetchFromGitHub { - owner = "CMB"; - repo = "edbrowse"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ZXxzQBAmu7kM3sjqg/rDLBXNucO8sFRFKXV8UxQVQZU="; - }; - - sourceRoot = "${finalAttrs.src.name}/src"; - - patches = [ - # Fixes some small annoyances on src/makefile - ./0001-small-fixes.patch - ]; - - patchFlags = [ - "-p2" - ]; - - postPatch = '' - for file in $(find ./tools/ -type f ! -name '*.c'); do - patchShebangs $file - done - ''; - - nativeBuildInputs = [ - pkg-config - which - ]; - - buildInputs = - [ - curl - duktape - html-tidy - openssl - pcre - perl - quickjs - readline - ] - ++ lib.optionals withODBC [ - unixODBC - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - preBuild = '' - buildFlagsArray+=( - BUILD_EDBR_ODBC=${if withODBC then "on" else "off"} - EBDEMIN=on - QUICKJS_LDFLAGS="-L${quickjs}/lib/quickjs -lquickjs -ldl -latomic" - ) - ''; - - meta = { - homepage = "https://edbrowse.org/"; - description = "Command Line Editor Browser"; - longDescription = '' - Edbrowse is a combination editor, browser, and mail client that is 100% - text based. The interface is similar to /bin/ed, though there are many - more features, such as editing multiple files simultaneously, and - rendering html. This program was originally written for blind users, but - many sighted users have taken advantage of the unique scripting - capabilities of this program, which can be found nowhere else. A batch - job, or cron job, can access web pages on the internet, submit forms, and - send email, with no human intervention whatsoever. edbrowse can also tap - into databases through odbc. It was primarily written by Karl Dahlke. - ''; - license = with lib.licenses; [ gpl1Plus ]; - mainProgram = "edbrowse"; - maintainers = with lib.maintainers; [ - schmitthenner - equirosa - ]; - platforms = lib.platforms.linux; - }; -}) -# TODO: send the patch to upstream developers diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 80aaf47901f0..922098cd6f86 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -566,6 +566,7 @@ mapAliases { ec2-utils = amazon-ec2-utils; # Added 2022-02-01 ecryptfs-helper = throw "'ecryptfs-helper' has been removed, for filesystem-level encryption, use fscrypt"; # Added 2025-04-08 + edbrowse = throw "'edbrowse' has been removed as it was unmaintained in Nixpkgs"; # Added 2025-05-18 edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01 edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24 eintopf = lauti; # Project was renamed, added 2025-05-01