Commit Graph

134 Commits

Author SHA1 Message Date
John Ericson
1ac5398589 *-wrapper; Switch from infixSalt to suffixSalt
I hate the thing too even though I made it, and rather just get rid of
it. But we can't do that yet. In the meantime, this brings us more
inline with autoconf and will make it slightly easier for me to write a
pkg-config wrapper, which we need.
2020-05-12 00:44:44 -04:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Kirill Elagin
c0d1f26d42 gettext: Remove the rebuild optimisation hack 2020-01-31 15:49:26 -05:00
Kirill Elagin
d9e4fc31ea gettext: Add macOS warning patch
gettext 0.20 fixed a bug with handling locale on macOS, but this caused
it to report an annoying warning on systems where “language”
differs from “region”. See Homebrew issue for details:
<https://github.com/Homebrew/homebrew-core/issues/41139>.

Add upstream patch that has not been released yet.
Details:
<https://www.mail-archive.com/bug-gnulib@gnu.org/msg36768.html>.
2020-01-30 21:22:32 -05:00
Merijn Broeren
133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
Daiderd Jordan
27313767b8
gettext: fix darwin build
The CF configure flags broke with the last update but based on
fa9c81f694 and the comment it seems like
these are not necessary anymore.

    $ nix-build -A stdenv.__bootPackages.stdenv.__bootPackages.gettext
    /nix/store/dii9p8717rjnbzar4kh1q3sxk77dbbkd-gettext-0.20.1

    $ nix-store -qR /nix/store/dii9p8717rjnbzar4kh1q3sxk77dbbkd-gettext-0.20.1
    /nix/store/2ws9cmamvr7xyvdg4d2nnd1bmr1zjrrq-bootstrap-tools
    /nix/store/2yn28axagwyifnvdm8npy2f982jxr986-libiconv-osx-10.12.6
    /nix/store/dii9p8717rjnbzar4kh1q3sxk77dbbkd-gettext-0.20.1
2019-11-15 18:54:47 +01:00
Frederik Rietdijk
afd716fcda gettext: add patch to fix --for-msgfmt
Fix behaviour of --for-msgfmt on PO files with no translations.
2019-11-13 13:58:14 +01:00
Lancelot SIX
3e267ad39b gettext: 0.19.8.1 -> 0.20.1
- 0.20 release information: https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00006.html
- 0.20.1 release information: https://lists.gnu.org/archive/html/info-gnu/2019-05/msg00011.html
2019-11-12 14:49:34 +01:00
John Ericson
d21a660642 gettext, libiconv: dontAddExtraLibs can be legitimately undefined 2019-11-01 14:44:44 -04:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Ben Wolsieffer
16fe069ef5 gettext: fix cross build (#60123) 2019-04-23 14:27:13 -07:00
strager
6ccf2201f9 gettext: fix stdenv-darwin; remove Bison dependency (#59553)
Commit 1279016787 broke building
nixpkgs.clangStdenv (stdenv-darwin) on macOS:

    nix-build -A clangStdenv .
    these derivations will be built:
      /nix/store/b3vyrfzarzyh51n7fj9wrpw12sq3765l-stdenv-darwin.drv
    building '/nix/store/b3vyrfzarzyh51n7fj9wrpw12sq3765l-stdenv-darwin.drv'...
    output '/nix/store/3agkxvkbhfpimnx5imr09q4rq9pxmjda-stdenv-darwin' is not allowed to refer to the following paths:
         /nix/store/jnzhx3hni0ds1wf49z8wfnxi3qdnkk6q-gnum4-1.4.18
           /nix/store/smdncnz5pkl5q39k4ldk8bh84p2hmj19-bison-3.3.2
    error: build of '/nix/store/b3vyrfzarzyh51n7fj9wrpw12sq3765l-stdenv-darwin.drv' failed

Remove gettext's build dependency on Bison to avoid this error, fixing
Nixpkgs on macOS.

To avoid rebuilding everything unnecessarily on Linux, only apply these
changes to macOS and keep the Bison dependency for Linux.
2019-04-15 01:09:44 -04:00
Vladimír Čunát
1279016787
Re-Revert "Merge #58997 gettext: apply patch for CVE 2018-1875"
This reverts commit 742416addb.
Moved to staging.
2019-04-05 21:03:59 +02:00
Matthew Bauer
7a00e80329 ghc: don’t add libiconv automatically
ghc needs it to fail to correctly detect it for later.
2018-12-05 13:17:40 -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
Jan Malakhovski
20106e1066 gettext: disable parallel checking 2018-09-05 01:14:40 +00: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
Markus Kowalewski
dbc97ef68c
gettext: add license 2018-08-20 19:50:39 +02:00
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
John Ericson
5d116251db
Merge pull request #37707 from obsidiansystems/gettext-setup-hook-cross
gettext, libiconv: Make setup hook work for cross
2018-03-23 15:21:43 -04:00
John Ericson
1482c3c8d8 gettext: Make setup hook work for cross 2018-03-23 12:07:11 -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
Matthew Bauer
90c132c7f1 gettext: add -lintl to setup-hook 2018-03-22 16:50:10 -05:00
Sarah Brofeldt
95ecb1f203 gettext: Don't use envHooks anymore 2018-01-06 15:11:12 +01: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
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