public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libedit: 20150325-3.1 -> 20160903-3.1

Browse Source 
Also, use a separate "dev" output. This is mostly to remove
ncurses.dev from openssh's runtime closure.
This commit is contained in:
Eelco Dolstra 2016-09-05 12:00:03 +02:00
parent 13fced071e
commit 2583c70e91
3 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/libedit/default.nix
View File

@ -1,17 +1,19 @@
{ stdenv, fetchurl, ncurses, groff }: { stdenv, fetchurl, ncurses, groff }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libedit-20150325-3.1"; name = "libedit-20160903-3.1";
src = fetchurl { src = fetchurl {
url = "http://www.thrysoee.dk/editline/${name}.tar.gz"; url = "http://thrysoee.dk/editline/${name}.tar.gz";
sha256 = "1if8zi9h52m80ck796an28rrqfljk2n8cn25m3fl0prwz155x2n8"; sha256 = "0rvmm8z6hal5bbp5pljp7yvkpqi4pkas1amizhvg35v0skkx5jqc";
}; };
outputs = [ "out" "dev" ];
# Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
NROFF = "${groff}/bin/nroff"; NROFF = "${groff}/bin/nroff";
patches = [ ./01-cygwin.patch ./freebsd-wchar.patch ]; patches = [ ./01-cygwin.patch ];
propagatedBuildInputs = [ ncurses ]; propagatedBuildInputs = [ ncurses ];
@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "http://www.thrysoee.dk/editline/"; homepage = http://www.thrysoee.dk/editline/;
description = "A port of the NetBSD Editline library (libedit)"; description = "A port of the NetBSD Editline library (libedit)";
license = licenses.bsd3; license = licenses.bsd3;
platforms = platforms.all; platforms = platforms.all;

13
pkgs/development/libraries/libedit/freebsd-wchar.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/chartype.h b/src/chartype.h
index 0beee17..4ac86f3 100644
--- a/src/chartype.h
+++ b/src/chartype.h
@@ -44,7 +44,7 @@
* supports non-BMP code points without requiring UTF-16, but nothing
* seems to actually advertise this properly, despite Unicode 3.1 having
* been around since 2001... */
-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__)
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__OpenBSD__)
#ifndef __STDC_ISO_10646__
/* In many places it is assumed that the first 127 code points are ASCII
* compatible, so ensure wchar_t indeed does ISO 10646 and not some other

13
pkgs/development/libraries/libedit/freebsd.patch
View File

@ -1,13 +0,0 @@
diff --git a/src/chartype.h b/src/chartype.h
index c35825c..be5aac0 100644
--- a/src/chartype.h
+++ b/src/chartype.h
@@ -44,7 +44,7 @@
* supports non-BMP code points without requiring UTF-16, but nothing
* seems to actually advertise this properly, despite Unicode 3.1 having
* been around since 2001... */
-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__))
+#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__DragonFly__) && !defined(__FreeBSD__)
#ifndef __STDC_ISO_10646__
/* In many places it is assumed that the first 127 code points are ASCII
* compatible, so ensure wchar_t indeed does ISO 10646 and not some other