summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo QuirĂ³s <39096810+equirosa@users.noreply.github.com>2019-12-12 13:01:35 -0600
committerRenaud <c0bw3b@users.noreply.github.com>2019-12-12 20:01:35 +0100
commit768943000f9af627b4d2d238b4ed555326d2cada (patch)
tree78028b4b781b92c9a3f8990f3306ae6a9e79c42a
parent20c33be286abd80e41537609843fc50f14a15560 (diff)
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
-rw-r--r--pkgs/applications/editors/edbrowse/default.nix23
1 files changed, 9 insertions, 14 deletions
diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index 0de514233f8e..1161fc8256cb 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -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 {
pname = "edbrowse";
- version = "3.7.4";
+ version = "3.7.6";
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 = ''
for i in ./tools/*.pl
do
@@ -21,13 +13,16 @@ stdenv.mkDerivation rec {
done
'';
- makeFlags = "-C src prefix=$(out)";
+ makeFlags = [
+ "-C src"
+ "prefix=${placeholder "out"}"
+ ];
src = fetchFromGitHub {
owner = "CMB";
repo = "edbrowse";
rev = "v${version}";
- sha256 = "0i9ivyfy1dd16c89f392kwx6wxgkkpyq2hl32jhzra0fb0zyl0k6";
+ sha256 = "0yk4djb9q8ll94fs57y706bsqlar4pfx6ysasvkzj146926lrh8a";
};
meta = with stdenv.lib; {
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.
'';
license = licenses.gpl1Plus;
- homepage = http://edbrowse.org/;
- maintainers = [ maintainers.schmitthenner maintainers.vrthra ];
+ homepage = "https://edbrowse.org/";
+ maintainers = with maintainers; [ schmitthenner vrthra equirosa ];
platforms = platforms.linux;
};
}