diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-13 11:43:39 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-12-13 11:43:39 +0100 |
commit | dfdf1597a7cc13c40653722a771be12afaa64edb (patch) | |
tree | 4d7cd3f21ba89453f23ea1addb55e00574a638bf /pkgs/applications/editors | |
parent | d5d8b3514d64fcd4022186795f604ec3f360ae17 (diff) | |
parent | 418ad571c3ec856d49b65fa53ab99f185c2d9def (diff) | |
download | nixlib-dfdf1597a7cc13c40653722a771be12afaa64edb.tar nixlib-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.gz nixlib-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.bz2 nixlib-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.lz nixlib-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.xz nixlib-dfdf1597a7cc13c40653722a771be12afaa64edb.tar.zst nixlib-dfdf1597a7cc13c40653722a771be12afaa64edb.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/edbrowse/default.nix | 23 | ||||
-rw-r--r-- | pkgs/applications/editors/nano/default.nix | 9 |
2 files changed, 18 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; }; } diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 6f29946d77a8..7b2992201fc7 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -38,6 +38,15 @@ in stdenv.mkDerivation rec { (stdenv.lib.enableFeature enableTiny "tiny") ]; + patches = [ + (fetchurl { + # fix compilation on macOS, where 'st_mtim' is unknown + # upstream patch not in 4.6 + url = "https://git.savannah.gnu.org/cgit/nano.git/patch/?id=f516cddce749c3bf938271ef3182b9169ac8cbcc"; + sha256 = "0gqymvr5vxxypr7y3sm252rsi4gjqp597l01x0lkxyvxsn45a4sx"; + }) + ]; + postInstall = '' cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/ ''; |