edbrowse: 3.7.4 -> 3.7.6 (#75087)

* edbrowse: 3.7.4 -> 3.7.6

* Remove unneeded patch

* edbrowse: update source hash for v3.7.6
+ turn makeFlags into a list
+ update meta.homepage
This commit is contained in:
Eduardo Quirós
2019-12-12 20:01:35 +01:00
committed by Renaud
parent 20c33be286
commit 768943000f
+9 -14
View File
@@ -1,19 +1,11 @@
{ stdenv, fetchFromGitHub, fetchpatch, duktape, curl, pcre, readline, openssl, perl, html-tidy }: { stdenv, fetchFromGitHub, duktape, curl, pcre, readline, openssl, perl, html-tidy }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "edbrowse"; pname = "edbrowse";
version = "3.7.4"; version = "3.7.6";
buildInputs = [ curl pcre readline openssl duktape perl html-tidy ]; buildInputs = [ curl pcre readline openssl duktape perl html-tidy ];
patches = [
# Fix build against recent libcurl
(fetchpatch {
url = https://github.com/CMB/edbrowse/commit/5d2b9e21fdf019f461ebe62738d615428d5db963.diff;
sha256 = "167q8n0syj3iv6lxrbpv4kvb63j4byj4qxrxayy08bah3pss3gky";
})
];
postPatch = '' postPatch = ''
for i in ./tools/*.pl for i in ./tools/*.pl
do do
@@ -21,13 +13,16 @@ stdenv.mkDerivation rec {
done done
''; '';
makeFlags = "-C src prefix=$(out)"; makeFlags = [
"-C src"
"prefix=${placeholder "out"}"
];
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "CMB"; owner = "CMB";
repo = "edbrowse"; repo = "edbrowse";
rev = "v${version}"; rev = "v${version}";
sha256 = "0i9ivyfy1dd16c89f392kwx6wxgkkpyq2hl32jhzra0fb0zyl0k6"; sha256 = "0yk4djb9q8ll94fs57y706bsqlar4pfx6ysasvkzj146926lrh8a";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Command Line Editor Browser"; description = "Command Line Editor Browser";
@@ -39,8 +34,8 @@ stdenv.mkDerivation rec {
edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke. edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke.
''; '';
license = licenses.gpl1Plus; license = licenses.gpl1Plus;
homepage = http://edbrowse.org/; homepage = "https://edbrowse.org/";
maintainers = [ maintainers.schmitthenner maintainers.vrthra ]; maintainers = with maintainers; [ schmitthenner vrthra equirosa ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }