Commit Graph

85 Commits

Author SHA1 Message Date
Ryan Mulligan
838a38c4c7 gettext: 0.19.8 -> 0.19.8.1 (#36530) 2018-06-03 12:44:57 +00:00
John Ericson
5e17335bd7 Merge remote-tracking branch 'upstream/staging' into strictDeps 2018-05-14 23:33:03 -04:00
John Ericson
330ca731e8 treewide: Get rid of all uses of crossConfig
The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)

Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:

 - bintools-wrapper and cc-wrapper
2018-05-14 23:30:37 -04:00
John Ericson
2110c0bd30 treewide: Use pkgs/build-support/roles.bash to remove copy pasta
Also fix some setup hooks that unnecessarily used environment hooks,
which revolted in the same variable being modified too many times.
2018-05-07 15:10:37 -04:00
Will Dietz
b59fd70210 gettext: don't add -lintl on musl, either
gettext won't actually provide libintl unless we go out of
our way to tell it to do so [1][2].

We could add those flags on musl (as I initially did in [3]),
but then we have two different libintl.h files and generally
some confusion about which gettext is being used.

Instead of sorting that out, for now let's just continue on
without gettext providing libintl-- it's worked well enough so far.

Only change that needs to be made, then, is to avoid
adding -lintl on musl since there is no libintl.

[1] c739240fd2
[2] https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-libs/libintl/libintl-0.19.8.1.ebuild?id=332e48712b6521697f992f923c9c985482dd1c36#n41
[3] 729302f29a
2018-03-23 03:04:55 -05:00
Matthew Bauer
0a2ef04359 gettext: fixup 2018-03-22 16:50:16 -05:00
Matthew Bauer
d9aaae5579 gettext: disable hook when libc == glibc 2018-03-22 16:50:15 -05:00
Orivej Desh
a5c832f1af gettext: add setup hook populating GETTEXTDATADIRS
Fixes #32296

(cherry picked from commit f727aeb4505a9646eb7f7d67ed0fd411900b570c)
2017-12-04 15:26:52 +00:00
Vladimír Čunát
16cf448933
gettext, gcc5: enable stackprotector now
This has been forgotten in #29349 ?
2017-09-19 17:52:32 +02:00
John Ericson
2cc7f1a731 gettext: libiconv should be a buildInput 2017-08-30 16:49:52 -04:00
Tuomas Tynkkynen
1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc)
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
2017-08-11 21:32:54 +03:00
David McFarland
b92840487e gettext: fix cygwin build 2017-06-26 09:33:19 -03:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Rahul Gopinath
2dca0444fa gettext: 0.19.7 -> 0.19.8 2016-07-09 16:47:53 +02:00
Eric Litak
78f7933829 infinite recursion and cross-build fix 2016-05-31 09:33:32 -07:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Vladimír Čunát
afaf1c2f77 gettext: remove crossAttrs
They seem not needed anymore.
2016-04-23 10:52:00 +02:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
zimbatm
f05bc0444a gettext: 0.19.6 -> 0.19.7
expat is replaced by a bundled version of libxml2
2016-02-22 22:47:45 +00:00
Robin Gloster
402d57ee8e bootstrap env: disable stackprotector hardening until gcc >=4.9 2016-02-22 18:32:53 +00:00
Robin Gloster
bc21db3692 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-19 21:16:14 +00:00
Vladimír Čunát
74bda15a94 gettext.sh: fixup calls to absolute paths
For discussion see https://github.com/NixOS/nixpkgs/pull/13072
2016-02-17 18:16:20 +01:00
Robin Gloster
f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Arseniy Seroka
7d02a16aec gettext: fix absolute path 2015-12-14 22:56:34 +03:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Lancelot SIX
090f27859c gettext: 0.19.5.1 -> 0.19.6 (close #9799) 2015-09-11 18:59:47 +02:00
Eelco Dolstra
e1f78bf677 More docs/manpages in separate outputs 2015-07-27 00:27:54 +02:00
William A. Kennington III
4877451d2e gettext: 0.19.5 -> 0.19.5.1 2015-07-17 14:38:00 -07:00
William A. Kennington III
35664f4569 gettext: 0.19.4 -> 0.19.5 2015-07-17 14:37:11 -07:00
Jude Taylor
fa9c81f694 pure darwin stdenv 2015-06-18 12:37:41 -07:00
Marko Durkovic
b658196c6c cygwin: libiconv and gettext for x86_64 2015-05-28 10:53:34 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
William A. Kennington III
762861670c gettext: Make 0.19 the default 2015-03-26 12:01:45 -07:00
Vladimír Čunát
4b58636c0d Revert "gettext: fix build on darwin"
This reverts commit fc15721871.

I trusted the referred comment (and maybe misunderstood it),
but the commit wasn't a good idea at all.
2015-03-10 18:09:03 +01:00
Vladimír Čunát
fc15721871 gettext: fix build on darwin
Hash on Linuxes is unchanged. For details about the error see discussion at:
https://github.com/NixOS/nixpkgs/commit/0ffb98828e87612
2015-03-10 17:38:29 +01:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
aszlig
f4edebfa12
gettext: Check for existence of stdenv.ccCross.
Should only affect cross-builds, however I didn't test whether
cross-building gettext actually works. But if it's broken now, it was
broken before as well and this at least unbreaks the non-cross-built
nixpkgs tarball job :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-03 18:27:41 +01:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Vladimír Čunát
8da52a642a Merge branch 'staging' into v/modular
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
Vladimír Čunát
4dccb224c5 WIP2 2014-08-26 01:10:56 +02: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
Peter Simons
2456150c1e gettext: strip trailing whitespace 2013-09-23 11:14:42 +02:00
Peter Simons
46a7b1ea0a gettext: fix minor errors after merge 2013-09-23 11:14:27 +02:00
Peter Simons
9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Vladimír Čunát
961c2fe7c3 coreutils,gettext: don't change hash except for darwin
Also some style cleanup.
Note that defining an empty-string variable *does* change the hash.
I would like to change this behaviour one day
(clean up attrs when compiling the derivation).
2013-09-14 14:56:10 +02:00