Commit graph

85 commits

Author SHA1 Message Date
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
William A. Kennington III 33e70ad68a ncurses: Add gcc-5 patch 2015-06-11 17:59:51 -07:00
Vladimír Čunát 317f4ea72d ncurses: header location fixes
- move headers directly to $out/include and set up symlinks.
Some packages were failing to find them (e.g. mariadb).
- postInstall was failing, only it was ignored due to a bug;
now it succeeds.
2015-06-07 09:22:35 +02:00
Eelco Dolstra 3096d03435 Revert "Refactor mkFlag / shouldUsePkg into the nixpkgs libraries"
This reverts commit 25a148fa19.
2015-06-04 14:54:48 +02:00
Eelco Dolstra cb9429bd31 ncurses: Don't install static libraries
Nixpkgs convention is not to install static libraries.
2015-06-01 20:47:08 +02:00
Eelco Dolstra 779ab6bfc7 ncurses: Revert to normal style
Also re-enable building shared libraries on Mac OS X as these worked
fine in the past.
2015-06-01 20:38:19 +02:00
Marko Durkovic a02799cd78 cygwin: fix ncurses
1. Fix linking against ncurses.dll
2. Fix segfaults with threaded code
2015-05-28 10:53:36 +02:00
Vladimír Čunát f83d12a382 Merge 'master' into staging 2015-05-24 20:39:58 +02:00
William A. Kennington III 5a89a87cc5 ncurses: Always symlink to a real .so and add symlinks for major versions 2015-05-22 15:31:53 -07:00
William A. Kennington III 25a148fa19 Refactor mkFlag / shouldUsePkg into the nixpkgs libraries 2015-05-22 13:26:55 -07:00
Shea Levy 82ba13111c ncurses: Fix shouldUsePkg on darwin 2015-05-12 06:26:31 -07:00
William A. Kennington III f73682c526 ncurses: Cleanup abi version 2015-05-03 20:30:09 -07:00
Thomas Tuegel 5535793302 ncurses5: add old ABI version for binary packages 2015-05-02 14:43:16 -05:00
William A. Kennington III 23f836615d ncurses: Fix gpm typo 2015-05-01 19:13:40 -07:00
William A. Kennington III ee78173b21 ncurses: Modernize build 2015-04-30 18:49:28 -07:00
Ludovic Courtès 41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Joel Taylor 3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Bjørn Forsman c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Eelco Dolstra 777617f987 ncurses: Build with standard gcc 2014-08-08 19:28:24 +02:00
Mateusz Kowalczyk 7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
John Wiegley f39471a873 ncurses: apply a patch on Darwin for a clang bug 2014-06-16 16:39:20 -07:00
Vladimír Čunát 267d0a5ab6 Merge #1633: --enable-symlinks in ncurses and e2fsprogs 2014-04-02 19:05:56 +02:00
Vladimír Čunát cb639302df Merge glibc-2.18 branch into stdenv-updates
It's to separate from other changes coming from master.

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (taking both changes)
	pkgs/development/libraries/ncurses/5_4.nix (deleted)
2013-12-28 18:51:23 +01:00
Bjørn Forsman 2b2c55e34a ncurses: add ncurses5-config -> ncursesw5-config symlink
We already have backward compatibility symlinks for ncurses libraries
and pkg-config files (when built in unicode/wide mode). The last bit is
to add a symlink from ncurses5-config to ncursesw5-config, which is what
this commit does.
2013-12-26 18:51:48 +01:00
Bjørn Forsman 50253a3e84 ncurses: install *.pc files (for pkg-config)
To make e.g. "pkg-config --cflags ncursesw" work.

The ncurses expression, when built in unicode/wide char mode, provides
backward compatibility symlinks from lib<name>.so to lib<name>w.so.
Provide similar symlinks for the *.pc files: <name>.pc -> <name>w.pc.
2013-12-26 18:31:24 +01:00
Eelco Dolstra dc5cc7cfb3 ncurses: Remove version 5.4
It's not used anywhere, and doesn't build:

http://hydra.nixos.org/build/7204910
2013-12-20 14:48:19 +01:00
Bjørn Forsman 3227c1d215 ncurses: fix includedir setting
${out} in configureFlags isn't expanded, so ncursesw5-config ends up
expanding ${out} at *runtime*. Here is the relevant ncursesw5-config
snippet showing how includedir gets its value at runtime.

  bindir="${exec_prefix}/bin"
  includedir="${out}/include"
  libdir="${exec_prefix}/lib"
  datadir="${prefix}/share"
  mandir="${prefix}/man"

When running in a plain shell you get this:
  $ ncursesw5-config --cflags
  -I/include/ncursesw -I/include

And when run in a nix-build shell for e.g. gpsd:
  $ ncursesw5-config --cflags
  -I/nix/store/HASH-gpsd-3.10/include/ncursesw -I/nix/store/HASH-gpsd-3.10/include

This is clearly wrong.

Q: How come this has gone undetected for years?
A: It seems few packages use ncursesw5-config to get the compiler
flags. For example, our python curses module builds its own compiler
flags.

Fix this by moving the --includedir setting to preConfigure where shell
variables are expanded.
2013-12-10 19:47:52 +01:00
Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02:00
Jason \"Don\" O'Conal f5a130b6b3 newsbeuter: add expression 2013-07-04 19:17:07 +02:00
Gergely Risko 8326038d2b Add ncursesw compatibility link also for includes
This is needed for the ncurses cabal package to compile.  It uses
include/ncursesw/curses.h, without trying include/curses.h first.  The
files are provided through include/ncursesw on a clean Debian too, in
the unicode case (when the libncursesw5-dev is installed).

Signed-off-by: Domen Kozar <domen@dev.si>
2013-05-27 18:16:00 +02:00