summaryrefslogtreecommitdiffstats
path: root/pkgs
diff options
context:
space:
mode:
authorGabriel Ebner <gebner@gebner.org>2020-10-10 20:21:15 +0200
committerGitHub <noreply@github.com>2020-10-10 20:21:15 +0200
commit44c9d7fc72bb1bbb56908b4386cac5599b80a54c (patch)
tree5507655f90e2d94b5fcea5e659dfea5cc4b85528 /pkgs
parentd892551a834f826875d892519375c480b7fa7de3 (diff)
parentbd8dea89cb28e2c4335b53c72042706195a93e13 (diff)
Merge pull request #100152 from gebner/elinks0135
elinks: 0.13.2 -> 0.13.5
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/applications/networking/browsers/elinks/debian-patches.nix34
-rw-r--r--pkgs/applications/networking/browsers/elinks/debian-patches.txt8
-rw-r--r--pkgs/applications/networking/browsers/elinks/default.nix49
3 files changed, 21 insertions, 70 deletions
diff --git a/pkgs/applications/networking/browsers/elinks/debian-patches.nix b/pkgs/applications/networking/browsers/elinks/debian-patches.nix
deleted file mode 100644
index 07df14767aa6..000000000000
--- a/pkgs/applications/networking/browsers/elinks/debian-patches.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-# Generated by debian-patches.sh from debian-patches.txt
-let
- prefix = "https://sources.debian.org/data/main/e/elinks/0.13.2-1/debian/patches";
-in
-[
- {
- url = "${prefix}/03_459467_ui.leds.enable_0.diff";
- sha256 = "0l35lglmnvyzz3xyy18nksra14gsp7yc67rskbzmr61szg8b9jqr";
- }
- {
- url = "${prefix}/04_436817_nostrip.diff";
- sha256 = "0ixvxaba1ww375gpdh7r67srp3xsfb5vyz2sfv1pgj6mczwg8v24";
- }
- {
- url = "${prefix}/07_617713_cache_control.diff";
- sha256 = "0drn4r33ywvmihr0drsp2jwz7mlf5z5fv8ra7fpkdavx45xqaf15";
- }
- {
- url = "${prefix}/10-reproducible-build.diff";
- sha256 = "024yp3xsh0hw29l1wikfmk9j3mqval6pdr4xi7rzffrlaknh58h5";
- }
- {
- url = "${prefix}/14_debug_disable_Werror.diff";
- sha256 = "0s620r88ikfljflb5nd133cww2wc0i85ag8lzpvrsmg0q00hfmax";
- }
- {
- url = "${prefix}/16_POST_BUFFER_SIZE.diff";
- sha256 = "17vkvy0d0rabmgk8iqwgdsrgjn6dbb9cf6760qbz82zlb37s09nh";
- }
- {
- url = "${prefix}/11-reproducible-build.diff";
- sha256 = "1z17g9z68lh12fs6fkralfghh8bs1bs5mlq83d15l4bn3za3s0sl";
- }
-]
diff --git a/pkgs/applications/networking/browsers/elinks/debian-patches.txt b/pkgs/applications/networking/browsers/elinks/debian-patches.txt
deleted file mode 100644
index 29efcf2d7a80..000000000000
--- a/pkgs/applications/networking/browsers/elinks/debian-patches.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-elinks/0.13.2-1
-03_459467_ui.leds.enable_0.diff
-04_436817_nostrip.diff
-07_617713_cache_control.diff
-10-reproducible-build.diff
-14_debug_disable_Werror.diff
-16_POST_BUFFER_SIZE.diff
-11-reproducible-build.diff
diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix
index 7d67ecdb3767..79f3cb76a01a 100644
--- a/pkgs/applications/networking/browsers/elinks/default.nix
+++ b/pkgs/applications/networking/browsers/elinks/default.nix
@@ -1,42 +1,38 @@
-{ stdenv, fetchurl, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib, brotli, openssl, autoconf, automake, gettext, pkgconfig, libev
-, gpm
+{ stdenv, fetchFromGitHub, fetchpatch, ncurses, xlibsWrapper, bzip2, zlib
+, brotli, zstd, lzma, openssl, autoreconfHook, gettext, pkgconfig, libev
+, gpm, libidn, tre, expat
, # Incompatible licenses, LGPLv3 - GPLv2
enableGuile ? false, guile ? null
, enablePython ? false, python ? null
, enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null
-, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey_38 ? null
+# re-add javascript support when upstream supports modern spidermonkey
}:
assert enableGuile -> guile != null;
assert enablePython -> python != null;
stdenv.mkDerivation rec {
- pname = "elinks-0.13.2";
- version = "0.13.2";
-
- src = fetchurl {
- url = "https://deb.debian.org/debian/pool/main/e/elinks/elinks_${version}.orig.tar.gz";
- sha256 = "0xkpqnqy0x8sizx4snca0pw3q98gkhnw5a05yf144j1x1y2nb14c";
+ pname = "elinks";
+ version = "0.13.5";
+
+ src = fetchFromGitHub {
+ owner = "rkd77";
+ repo = "felinks";
+ rev = "v${version}";
+ sha256 = "067l9m47j40039q8mvvnxd1amwrac3x6vv0c0svimfpvj4ammgkg";
};
- patches = map fetchurl (import ./debian-patches.nix);
-
- postPatch = (stdenv.lib.optional stdenv.isDarwin) ''
- patch -p0 < ${fetchpatch {
- url = "https://raw.githubusercontent.com/macports/macports-ports/72bed7749e76b9092ddd8d9fe2d8449c5afb1d71/www/elinks/files/patch-perl.diff";
- sha256 = "14q9hk3kg2n2r5b062hvrladp7b4yzysvhq07903w9kpg4zdbyqh";
- }}
- '';
-
- buildInputs = [ ncurses xlibsWrapper bzip2 zlib brotli openssl libev ]
+ buildInputs = [
+ ncurses xlibsWrapper bzip2 zlib brotli zstd lzma
+ openssl libidn tre expat libev
+ ]
++ stdenv.lib.optional stdenv.isLinux gpm
++ stdenv.lib.optional enableGuile guile
++ stdenv.lib.optional enablePython python
++ stdenv.lib.optional enablePerl perl
- ++ stdenv.lib.optional enableSpidermonkey spidermonkey_38
;
- nativeBuildInputs = [ autoconf automake gettext pkgconfig ];
+ nativeBuildInputs = [ autoreconfHook gettext pkgconfig ];
configureFlags = [
"--enable-finger"
@@ -46,23 +42,20 @@ stdenv.mkDerivation rec {
"--enable-bittorrent"
"--enable-nntp"
"--enable-256-colors"
+ "--enable-true-color"
+ "--with-lzma"
"--with-libev"
+ "--with-terminfo"
] ++ stdenv.lib.optional enableGuile "--with-guile"
++ stdenv.lib.optional enablePython "--with-python"
++ stdenv.lib.optional enablePerl "--with-perl"
- ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey_38}"
;
- preConfigure = ''
- patchShebangs ./autogen.sh
- ./autogen.sh
- '';
-
meta = with stdenv.lib; {
description = "Full-featured text-mode web browser (package based on the fork felinks)";
homepage = "https://github.com/rkd77/felinks";
license = licenses.gpl2;
platforms = with platforms; linux ++ darwin;
- maintainers = with maintainers; [ iblech ];
+ maintainers = with maintainers; [ iblech gebner ];
};
}