Merge pull request #291446 from atorres1985-contrib/edbrowse

edbrowse: enable Unix ODBC support

2 files changed, 0 insertions, 100 deletions

diff --git a/pkgs/applications/editors/edbrowse/0001-small-fixes.patch b/pkgs/applications/editors/edbrowse/0001-small-fixes.patch
deleted file mode 100644
index 433b884cc5de..000000000000
--- a/pkgs/applications/editors/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/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
deleted file mode 100644
index 0f51e016c0ea..000000000000
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, curl
-, duktape
-, html-tidy
-, openssl
-, pcre
-, perl
-, pkg-config
-, quickjs
-, readline
-, which
-}:
-
-stdenv.mkDerivation rec {
-  pname = "edbrowse";
-  version = "3.8.0";
-
-  src = fetchFromGitHub {
-    owner = "CMB";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-ZXxzQBAmu7kM3sjqg/rDLBXNucO8sFRFKXV8UxQVQZU=";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    which
-  ];
-  buildInputs = [
-    curl
-    duktape
-    html-tidy
-    openssl
-    pcre
-    perl
-    quickjs
-    readline
-  ];
-
-  patches = [
-    # Fixes some small annoyances on src/makefile
-    ./0001-small-fixes.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace src/makefile --replace\
-      '-L/usr/local/lib/quickjs' '-L${quickjs}/lib/quickjs'
-    for i in $(find ./tools/ -type f ! -name '*.c'); do
-      patchShebangs $i
-    done
-  '';
-
-  makeFlags = [
-    "-C" "src"
-    "PREFIX=${placeholder "out"}"
-  ];
-
-  meta = with lib; {
-    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 = licenses.gpl1Plus;
-    maintainers = with maintainers; [ schmitthenner vrthra equirosa ];
-    platforms = platforms.linux;
-    mainProgram = "edbrowse";
-  };
-}
-# TODO: send the patch to upstream developers