Commit graph

135 commits

Author SHA1 Message Date
Alyssa Ross a3e6044fa6 ncurses: fix build on NetBSD
Only tested cross-compiling, but is probably necessary for native too.

Fixes errors like this:

linking ../lib/libncursesw.so
x86_64-unknown-netbsd-gcc  --param max-inline-insns-single=1200 -Wl,-shared -Wl,-Bshareable -o ../lib/libncursesw.so ../obj_s/hardscroll.o ../obj_s/hashmap.o ../obj_s/lib_addch.o ../obj_s/lib_addstr.o ../obj_s/lib_beep.o ../obj_s/lib_bkgd.o ../obj_s/lib_box.o ../obj_s/lib_chgat.o ../obj_s/lib_clear.o ../obj_s/lib_clearok.o ../obj_s/lib_clrbot.o ../obj_s/lib_clreol.o ../obj_s/lib_color.o ../obj_s/lib_colorset.o ../obj_s/lib_delch.o ../obj_s/lib_delwin.o ../obj_s/lib_echo.o ../obj_s/lib_endwin.o ../obj_s/lib_erase.o ../obj_s/lib_flash.o ../obj_s/lib_gen.o ../obj_s/lib_getch.o ../obj_s/lib_getstr.o ../obj_s/lib_hline.o ../obj_s/lib_immedok.o ../obj_s/lib_inchstr.o ../obj_s/lib_initscr.o ../obj_s/lib_insch.o ../obj_s/lib_insdel.o ../obj_s/lib_insnstr.o ../obj_s/lib_instr.o ../obj_s/lib_isendwin.o ../obj_s/lib_leaveok.o ../obj_s/lib_mouse.o ../obj_s/lib_move.o ../obj_s/lib_mvcur.o ../obj_s/lib_mvwin.o ../obj_s/lib_newterm.o ../obj_s/lib_newwin.o ../obj_s/lib_nl.o ../obj_s/lib_overlay.o ../obj_s/lib_pad.o ../obj_s/lib_printw.o ../obj_s/lib_redrawln.o ../obj_s/lib_refresh.o ../obj_s/lib_restart.o ../obj_s/lib_scanw.o ../obj_s/lib_screen.o ../obj_s/lib_scroll.o ../obj_s/lib_scrollok.o ../obj_s/lib_scrreg.o ../obj_s/lib_set_term.o ../obj_s/lib_slk.o ../obj_s/lib_slkatr_set.o ../obj_s/lib_slkatrof.o ../obj_s/lib_slkatron.o ../obj_s/lib_slkatrset.o ../obj_s/lib_slkattr.o ../obj_s/lib_slkclear.o ../obj_s/lib_slkcolor.o ../obj_s/lib_slkinit.o ../obj_s/lib_slklab.o ../obj_s/lib_slkrefr.o ../obj_s/lib_slkset.o ../obj_s/lib_slktouch.o ../obj_s/lib_touch.o ../obj_s/lib_tstp.o ../obj_s/lib_ungetch.o ../obj_s/lib_vidattr.o ../obj_s/lib_vline.o ../obj_s/lib_wattroff.o ../obj_s/lib_wattron.o ../obj_s/lib_winch.o ../obj_s/lib_window.o ../obj_s/nc_panel.o ../obj_s/safe_sprintf.o ../obj_s/tty_update.o ../obj_s/varargs.o ../obj_s/vsscanf.o ../obj_s/lib_freeall.o ../obj_s/charable.o ../obj_s/lib_add_wch.o ../obj_s/lib_box_set.o ../obj_s/lib_cchar.o ../obj_s/lib_erasewchar.o ../obj_s/lib_get_wch.o ../obj_s/lib_get_wstr.o ../obj_s/lib_hline_set.o ../obj_s/lib_in_wch.o ../obj_s/lib_in_wchnstr.o ../obj_s/lib_ins_wch.o ../obj_s/lib_inwstr.o ../obj_s/lib_key_name.o ../obj_s/lib_pecho_wchar.o ../obj_s/lib_slk_wset.o ../obj_s/lib_unget_wch.o ../obj_s/lib_vid_attr.o ../obj_s/lib_vline_set.o ../obj_s/lib_wacs.o ../obj_s/lib_wunctrl.o ../obj_s/expanded.o ../obj_s/legacy_coding.o ../obj_s/lib_dft_fgbg.o ../obj_s/lib_print.o ../obj_s/new_pair.o ../obj_s/resizeterm.o ../obj_s/use_screen.o ../obj_s/use_window.o ../obj_s/wresize.o ../obj_s/access.o ../obj_s/add_tries.o ../obj_s/alloc_ttype.o ../obj_s/codes.o ../obj_s/comp_captab.o ../obj_s/comp_error.o ../obj_s/comp_hash.o ../obj_s/comp_userdefs.o ../obj_s/db_iterator.o ../obj_s/doalloc.o ../obj_s/entries.o ../obj_s/fallback.o ../obj_s/free_ttype.o ../obj_s/getenv_num.o ../obj_s/home_terminfo.o ../obj_s/init_keytry.o ../obj_s/lib_acs.o ../obj_s/lib_baudrate.o ../obj_s/lib_cur_term.o ../obj_s/lib_data.o ../obj_s/lib_has_cap.o ../obj_s/lib_kernel.o ../obj_s/lib_keyname.o ../obj_s/lib_longname.o ../obj_s/lib_napms.o ../obj_s/lib_options.o ../obj_s/lib_raw.o ../obj_s/lib_setup.o ../obj_s/lib_termcap.o ../obj_s/lib_termname.o ../obj_s/lib_tgoto.o ../obj_s/lib_ti.o ../obj_s/lib_tparm.o ../obj_s/lib_tputs.o ../obj_s/lib_trace.o ../obj_s/lib_ttyflags.o ../obj_s/lib_twait.o ../obj_s/name_match.o ../obj_s/names.o ../obj_s/obsolete.o ../obj_s/read_entry.o ../obj_s/read_termcap.o ../obj_s/strings.o ../obj_s/tries.o ../obj_s/trim_sgr0.o ../obj_s/unctrl.o ../obj_s/visbuf.o ../obj_s/alloc_entry.o ../obj_s/captoinfo.o ../obj_s/comp_expand.o ../obj_s/comp_parse.o ../obj_s/comp_scan.o ../obj_s/parse_entry.o ../obj_s/write_entry.o ../obj_s/define_key.o ../obj_s/hashed_db.o ../obj_s/key_defined.o ../obj_s/keybound.o ../obj_s/keyok.o ../obj_s/version.o -L../lib
/nix/store/6h96vn8vpm01sn0r5shdl48nw94kzls6-x86_64-unknown-netbsd-binutils-2.35.1/bin/x86_64-unknown-netbsd-ld: /nix/store/dy4bg91z7g0p8k3cdq8rbmzj27lsmx5k-libc-netbsd-9.1-x86_64-unknown-netbsd/lib/crt0.o: in function `__start':
(.text+0x31): undefined reference to `__fini_array_start'
/nix/store/6h96vn8vpm01sn0r5shdl48nw94kzls6-x86_64-unknown-netbsd-binutils-2.35.1/bin/x86_64-unknown-netbsd-ld: /nix/store/dy4bg91z7g0p8k3cdq8rbmzj27lsmx5k-libc-netbsd-9.1-x86_64-unknown-netbsd/lib/crt0.o: relocation R_X86_64_PC32 against undefined hidden symbol `__fini_array_start' can not be used when making a shared object
/nix/store/6h96vn8vpm01sn0r5shdl48nw94kzls6-x86_64-unknown-netbsd-binutils-2.35.1/bin/x86_64-unknown-netbsd-ld: final link failed: bad value
collect2: error: ld returned 1 exit status
2021-06-13 13:52:01 +00:00
Jonathan Ringer 9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
John Ericson f52263ced0 treewide: Start to break up static overlay
We can use use `stdenv.hostPlatform.isStatic` instead, and move the
logic per package. The least opionated benefit of this is that it makes
it much easier to replace packages with modified ones, as there is no
longer any issue of overlay order.

CC @FRidh @matthewbauer
2021-01-03 19:18:16 +00:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
zowoq bb0d036002 ncurses: 6.1-20190112 -> 6.2
https://invisible-island.net/ncurses/announce-6.2.html
2020-03-06 07:01:42 +01:00
Linus Arver c7fbf93ecc ncurses: add infocmp utility 2019-11-12 14:39:08 +01:00
Matthew Bauer 92f0f8dd68 Merge remote-tracking branch 'NixOS/master' into staging 2019-01-27 00:01:13 -05:00
Jörg Thalheim b5c1deca8a
treewide: remove wkennington as maintainer
He prefers to contribute to his own nixpkgs fork triton.
Since he is still marked as maintainer in many packages
this leaves the wrong impression he still maintains those.
2019-01-26 10:05:32 +00:00
Frederik Rietdijk 43e867a226 ncurses: use github mirror
Development releases of ncurses are uploaded but often also removed
again. This is causing a lot of trouble, so let's instead use a
GitHub mirror.
2019-01-23 13:57:48 +01:00
Voob of Doom 138720f2f1 ncurses: 6.1-20181027 -> 6.1-20190112
v6.1-20181027 url is 404.
2019-01-19 09:40:58 +01:00
Jörg Thalheim ceaee84401 ncurses: fix cross-build by disable stripping
Ncurses uses `install -s` to also strip the binaries while installing.
This broke the cross build because the wrong strip command was chosen.
2018-12-09 13:49:41 +00:00
Matthew Bauer 53a67891ab ncurses: make shared linking optinoal
when enableShared = false, we set --without-shared flag.
2018-12-04 21:16:43 -06:00
c0bw3b 0498ccd076 Treewide: use HTTPS on GNU domains
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
2018-12-02 15:51:59 +01:00
Andrew Dunham f485b2e71f ncurses: upgrade from 6.1 -> 6.1-20181027
This includes fixes for CVE-2018-10754.

While we're changing things, also set the `--with-manpage-format=normal`
configure flag, which prevents the `configure` script from looking in
/usr to determine whether to compress manpages. This was already the
format on NixOS (where these directories don't exist), but making this
explicit makes the build more reproducible on other distros.
2018-11-06 22:47:36 -08:00
John Ericson 0828e2d8c3 treewide: Remove usage of remaining redundant platform compatability stuff
Want to get this out of here for 18.09, so it can be deprecated
thereafter.
2018-08-30 17:20:32 -04:00
Eric Wolf 4df268d237 ncurses: patch wrong st-0.7 terminfo 2018-08-09 12:13:49 +02:00
Frederik Rietdijk 6c72782d36 Merge staging-next into master 2018-07-22 11:04:28 +02:00
Matthew Bauer 3530c39b97 ncurses: add windows configure flags
these two flags are needed for windows support to work

- sp-funcs
- term-driver
2018-07-21 17:00:05 -04:00
Shea Levy af315bb6c8
ncurses: Fix static build. 2018-07-14 08:38:39 -04:00
Matthew Justin Bauer eeb016e8f0
Merge branch 'staging' into fix-ncurses-darwin-extensions 2018-05-02 15:40:38 -05:00
Josef Kemetmüller b4d9113fbf ncurses: Fix shared library extension on darwin
This fixes #36898
2018-05-02 21:53:45 +02:00
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