1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 21:21:06 +00:00
Commit graph

100 commits

Author SHA1 Message Date
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
zimbatm 05d4959251 gettext: expand all gettext.sh paths 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 dd915f82e7 expat: split dev output 2015-10-28 10:09:34 +01: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
Eelco Dolstra af6ebe817b Remove unused gettext versions 2015-07-27 00:27:19 +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 375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Luca Bruno d4a0cd2a94 Add gettextWithExpat function 2015-04-25 11:48:23 +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
Patrick Mahoney 70e7b34470 gettext: add derivation for 0.19 series 2015-01-10 13:26:01 -06: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
Mateusz Kowalczyk b186aa8f80 gettext-0.17: meta.branch 2014-09-30 10:56:12 +01: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
Danie Roux 14109047bd gettext: Guard against compiler not supporting __builtin_stpncpy
From https://lists.macosforge.org/pipermail/macports-dev/2011-July/015263.html:

5) Building with a compiler that doesn't support newer __builtins

If your port uses MacPorts compilers rather than the default compiler,
you may run into trouble with string functions.  You'll see errors at
link time about undefined __builtin_* functions.  If this happens, you
may want to compile with -D_FORTIFY_SOURCE=0 to tell the headers to
use unfortified versions which do not use compiler builtins.
2013-09-14 14:45:06 +02:00
Peter Simons 0d7118814b Merge branch 'origin/master' into stdenv. 2013-08-17 10:00:16 +02:00
Ludovic Courtès 2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Danny Wilson 66798d7aaf gettext: Remove old patch. Enable xz compression. 2013-02-28 20:04:11 +01:00
Danny Wilson 5436ca4d87 Update gettext to 0.18.2 2013-02-28 20:04:06 +01:00