Commit Graph

114 Commits

Author SHA1 Message Date
Matthew Bauer
7ab8c886a4 all-packages: more overrides normalizing 2018-05-01 13:54:51 -05:00
Tuomas Tynkkynen
34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
John Ericson
3a672cb7d2 libiconv, ncurses: Add optional flags for minimal android variant 2018-02-27 17:56:31 -05:00
Will Dietz
be6e6d2e04 ncurses 6.1: fix URL, accomodate captoinfo/infotocap along with tic 2018-02-23 10:18:05 -06:00
Will Dietz
edf201583d ncurses6: 20171125 -> 6.1
From my experience on slightly older tree,
a few *old* programs incorrectly rely on ncurses internal details
and may now require setting NCURSES_INTERNALS=1 to allow this badness.

Since this is release, we can grab it from gnu mirrors.
2018-02-23 10:17:23 -06:00
Tuomas Tynkkynen
ce8bd325e6 ncurses: Add temporary mirror for sources
Issue #35264
2018-02-22 03:36:36 +02:00
Tuomas Tynkkynen
3d24ae9b44 ncurses5: Use v6 sources but compiled with --with-abi-version=5
So we don't have to dig out why ncurses5.9 stops compiling with newer
compiler versions again and again.

Inspired by:

https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=ncurses5-compat-libs
2018-01-28 03:27:38 +02:00
Joachim F
407b8d2b8f
Merge pull request #33340 from dtzWill/update/invisible-island-misc
Update various invisible-island packages, fix URL's
2018-01-06 14:27:32 +00:00
Will Dietz
48a5212c15 ncurses: use more complicated expression to avoid mass-rebuilds, note 2018-01-03 08:49:48 -06:00
Will Dietz
96f0d3b908 ncurses: simplify patch expr, fix ncurses6 build w/clang
Somewhat amusingly given its name, "clang.patch" applies to both 5 and 6
but is the cause of ncurses6 breakage on 6 but is required on 5...
gcc is happy in all four configurations:

       5  5p 6  6p
gcc    ✓  ✓  ✓  ✓
clang  ✗  ✓  ✓  ✗

Which is why this commit enables the patch for 5 but not 6;
this matches behavior in Gentoo, for example.

For further simplification, we also use gcc-5 patch regardless.
2018-01-03 08:49:48 -06:00
Will Dietz
19f1fd14b3 invisible-island programs: Fix FTP URL's, use HTTPS, prefer ftp
FTP URL's should use ftp.invisible-island.net.
2018-01-02 12:31:33 -06:00
John Ericson
5b74540c5b treewide: Use depsBuildBuild for buildPackges.stdenv.cc 2017-12-30 22:04:21 -05:00
Tuomas Tynkkynen
2da5de5479 ncurses: 6.0-20170902 -> 6.0-20171125 2017-12-03 01:50:42 +02:00
Franz Pletz
fea02e30f1
ncurses: 6.0-20170729 -> 6.0-20170902
Fixes issues with xterm terminfo.
2017-09-05 20:14:15 +02:00
Casey Rodarmor
555900081d ncurses: put tic binary in bin 2017-08-27 14:54:23 -07:00
Guillaume Maudoux
e6661db29f ncurses: 6.0 -> 6.0-20170729
Bump version to include a patch that fixes #19785.
2017-08-22 03:32:07 +02:00
Daiderd Jordan
7e3a1a58cf
Revert "ncurses: look for terminfo entries in /etc"
This reverts commit b73a862f17.
2017-07-06 22:50:29 +02:00
Guillaume Maudoux
b73a862f17 ncurses: look for terminfo entries in /etc 2017-06-30 11:17:12 +02:00
David McFarland
33eec8e105 ncurses: fix cygwin build 2017-06-26 09:26:10 -03:00
John Ericson
a19cf228d5 ncurses: Break hash to simplify derivation 2017-05-18 07:02:54 -04:00
John Ericson
8ad2c6a830 ncurses: Fix for cross 2017-05-17 17:50:05 -04:00
Aristid Breitkreuz
e4f23bc8af ncurses: fix bug with libtinfo symlink that caused vim to fail 2016-12-28 16:02:11 +01:00
Sophie Taylor
c826ec6090 ncurses: Fix libtinfo for crossplatform 2016-12-23 13:18:58 +10:00
Sophie Taylor
41652f8ce5 ncurses: Create ABI-version'd libtinfo 2016-12-23 10:33:45 +10:00
Vladimír Čunát
2b883c6f56
Revert "Revert "Merge pull request #21350 from spacekitteh/patch-23""
This reverts commit 0c1382085b.
Moved to staging.
2016-12-22 11:29:39 +01:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Tuomas Tynkkynen
b0cc1cd729 ncurses: Add explicit 'ncurses5' and 'ncurses6' attrs
Also reinstate the gcc5 patch to make it build on Linux.
2016-07-16 23:47:28 +03:00
Vladimír Čunát
f56a319e3e ncurses: revert to 5.9 on Darwin (only)
I don't want to investigate why it won't compile.
http://hydra.nixos.org/build/37537876/nixlog/1/raw
2016-07-12 22:00:11 +02:00
Vladimír Čunát
d2dab39bfa ncurses: 5.9 -> 6.0
Upstream claims it's API-compatible with 5.*
It no longer installed *.pc until I passed pkgconfig executable;
without those things were breaking, even our library symlinking.
2016-07-09 16:50:14 +02:00
Thomas Tuegel
da972b6cc4 ncurses: move runtime utilities to $out
All the programs provided by ncurses were being installed to the $dev
output, but several of them are intended for runtime use, e.g. to
operate on the running terminal. These user-facing programs are moved to
the $bin output.

Several packages referred to "${ncurses}/bin" or "${ncurses.dev}/bin" at
runtime; these paths are also updated to refer to "${ncurses.bin}/bin".
2016-03-08 11:35:24 -06:00
Thomas Tuegel
3ef7671cea ncurses: combine $lib and $out outputs
The $lib output refers to the terminfo database in $out, which is about
10x larger than the ncurses shared library. Splitting these outputs
saves a small amount of space for any derivations that use the terminfo
database but not the ncurses library, but we do not have evidence that
any such exist.
2016-03-08 11:35:24 -06:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Danny Wilson
98180e3bb2 Fix ncurses 5.9 build on SmartOS.
Has been fixed before, but now includes C++ support.
2015-11-16 17:20:17 +01:00
taku0
63385e9712 ncurses: revived clang patch (close #10622) 2015-11-10 09:08:09 +01:00
Tuomas Tynkkynen
3d59a8e1a8 ncurses: Fix multiple-output flags
The old way resuts in literal '$(lib)' etc. in the pkg-config files.
2015-10-28 10:23:04 +01:00
Vladimír Čunát
ef3f961610 ncurses: split also man output (3-4 MB) 2015-10-13 20:19:02 +02:00
Vladimír Čunát
91407a8bdf ncurses: split into multiple outputs
Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
2015-10-13 20:18:44 +02:00
Eelco Dolstra
741bf840da Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c539, reversing
changes made to a27ca029ee.

Conflicts:
	pkgs/development/libraries/ncurses/default.nix
2015-10-06 15:24:20 +02:00
Jude Taylor
0a32eab91e fix LLVM packages to work in darwin stdenv 2015-10-05 08:46:56 -07:00
William A. Kennington III
3f1d497fbe ncurses: 5.9 -> 6.0 2015-09-15 12:14:12 -07:00
William A. Kennington III
fb0bc10de4 ncurses: Fix includedir in the pkgconfig referencing ${out} 2015-06-22 23:45:10 -07:00
William A. Kennington III
bdd88582e3 ncurses: Add a symlink to the fully suffixed directory which was incorrectly skipped when this code was modified 2015-06-22 20:25:26 -07:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Michael Raitza
7907a8bcba dialog: init at 1.2-20150225, closes #8457
Generate ncurses dialogs from shell scripts.
2015-06-22 18:11:05 +02:00
Jude Taylor
d28e5f1c61 fix ncurses pkgconfig path a final time 2015-06-21 00:57:17 -07:00
William A. Kennington III
c49301b2f7 ncurses: Cleanup some old hacks 2015-06-20 13:59:11 -07:00
Jude Taylor
faf33749ce install ncurses headers in the correct place 2015-06-20 13:13:42 -07:00
William A. Kennington III
5191f5be2e ncurses: Fix up library linking 2015-06-18 20:04:46 -07:00
Jude Taylor
9fd1920d8f fix ncurses renames on darwin 2015-06-18 17:04:09 -07:00