Commit Graph

90 Commits

Author SHA1 Message Date
Tuomas Tynkkynen
fd4b3dcccb gmp{4,5}: Split into multiple outputs
Keep all versions consistent so that e.g. 'gmp.dev' is always available,
regardless of version.
2016-08-29 14:49:52 +03:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Rahul Gopinath
70ef8a10eb gmp: 6.1.0 -> 6.1.1 2016-07-09 16:47:54 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Franz Pletz
baee91ec60 cc-wrapper: Check if ld supports -z, fixes darwin 2016-03-07 21:40:20 +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
402d57ee8e bootstrap env: disable stackprotector hardening until gcc >=4.9 2016-02-22 18:32:53 +00: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
William A. Kennington III
cf802b8075 gmp: 6.0.0a -> 6.1.0 2015-11-05 18:21:44 -08:00
Vladimír Čunát
40a973f962 gmp: split dev and info outputs, and disable static
Referrers should have been fixed in previous commits already.
2015-10-28 11:34:45 +01:00
Vladimír Čunát
148e03b2f1 gmp: split into multiple outputs 2015-10-28 10:15:49 +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
Jude Taylor
10d06f4252 darwin purity: gmp-4.3.2 2015-06-18 17:54:12 -07:00
Tuomas Tynkkynen
c240556a24 gmp: Fix build on ARM
The config.guess script tries to detect various ARM optimization flags
via /proc/cpuinfo. This is not only impure, but the detection is also
broken on multicore machines; on my quad-core system the machine type is
autodetected as 'neon neon neon neon-unknown-linux-gnueabihf':

checking build system type... Invalid configuration `neon': machine `neon' not recognized
configure: error: /nix/store/bafimhdj1yaxj6m1hvq7wvhwwizc939x-bootstrap-tools/bin/sh ./config.sub neon
neon
neon
neon-unknown-linux-gnueabihf failed
builder for ‘/nix/store/1npm2358bpvclj5w7fqjjwg72vbb0d79-gmp-6.0.0a.drv’ failed with exit code 1

Override the system type with the output of GNU config.guess to avoid
the autodetection.
2015-06-13 11:30:29 +03: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
cf1ec77ff6 gmp: Add version 6 2015-03-26 00:24:16 -07:00
Peter Simons
f2a376f52a Enable static libraries in "gmp" to allow static linking of Haskell programs.
Haskell programs depend on gmp to implement the unbounded Integer type. Without
static variants of gmp we cannot build statically linked Haskell programs, what
some users have found desirable in the past. So far, we've used an override to
derive our own copy of gmp in the Haskell ecosystem, but this patch ends the
dichotomy between Haskell and the rest of Nixpkgs by enabling static gmp
libraries in the default build default.
2015-02-13 22:18:27 +01:00
Peter Simons
37a39e9cb4 gmp: drop obsolete and unused version 5.0.5 2015-02-06 00:32:00 +01:00
Eric Seidel
cbd446d465 fix gmp on darwin 2015-02-03 15:18:28 -08:00
Ludovic Courtès
41b53577a8 unmaintain a bunch of packages 2015-01-13 22:33:49 +01:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Evgeny Egorochkin
08cb717c98 add meta.branch 2014-11-03 13:09:48 +02:00
Joel Taylor
6f949b2e87 get rid of nasty CC stuff 2014-09-09 13:54:26 -07:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07: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
a70180ba73 mutiout: make it builtin 2014-08-30 08:27:43 +02:00
Vladimír Čunát
fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +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
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vladimír Čunát
7c5a1b1d51 haskellPackages: use static-enabled 'gmp' to enable statically linked Haskell binaries
Pass '-optl-static -optl-pthread' to GHC to enable static linking.

Fixes <https://github.com/NixOS/nixpkgs/issues/3193>. Further details can be
found at <http://permalink.gmane.org/gmane.linux.distributions.nixos/13526>.
2014-07-12 15:12:05 +02:00
Vladimír Čunát
6bc20ea278 undo #2522 merge except on darwin
It was only meant for darwin originally anyway.
See the PR for discussion.
2014-06-01 20:46:33 +02:00
John Wiegley
4cb43d2a75 Build ppl and gmp correctly for building gcc48 on darwin 2014-05-28 01:35:31 -05:00
Peter Simons
2fb919fb5a gmp: update to version 5.1.3 2013-10-03 18:09:34 +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
Vladimír Čunát
11e380a937 gmp5: minor update 5.1.1 -> 5.1.2 and file rename 2013-06-30 08:59:29 +02:00
Peter Simons
e4f9d6b396 gmp-4.3.2.nix: disable test suite to fix the build
The test t-lucnum_ui fails (on Linux/x86_64) when built with GCC 4.8.
Newer versions of GMP don't have that issue anymore.
2013-04-08 01:24:14 +02:00
Vladimír Čunát
3836ef7d66 gmp: revert to using bz2 sources
Bootstrapping of stdenv can't handle anything else.
2013-03-18 18:23:32 +01:00
Danny Wilson
d007a78ccb Merge remote-tracking branch 'origin/stdenv-updates' into illumos
Conflicts:
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/mpc/default.nix
	pkgs/development/libraries/mpfr/default.nix
	pkgs/development/libraries/ppl/default.nix
	pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +01:00
Vladimír Čunát
637e799ead Merge stdenv-updates-gcc47 into stdenv-updates
Conflicts (simple):
	pkgs/development/libraries/gmp/5.0.5.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/top-level/all-packages.nix
2013-03-09 12:01:39 +01:00
Eelco Dolstra
674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Ludovic Courtès
653ad8ec2f gmp: disable stripping when cross-compiling 2013-03-06 15:20:06 +01:00
Danny Wilson
82240c899a Fix GMP build on Illumos.
- Use smaller xz sources instead of bz2 sources.
2013-02-28 20:04:03 +01:00
Peter Simons
4994518501 gmp: update to version 5.1.1 2013-02-18 12:01:49 +01:00
Mathijs Kwik
eebc0c6965 gmp: add back the cpuid patch to 5.0.5
it was lost during 5.0.5 -> 5.1.0 -> 5.1.0 w/o patch -> 5.0.5 w/o patch
2013-01-13 14:36:04 +01:00
Mathijs Kwik
418f6a536f gmp: add back the cpuid patch to 5.0.5
it was lost during 5.0.5 -> 5.1.0 -> 5.1.0 w/o patch -> 5.0.5 w/o patch
2013-01-13 11:27:29 +01:00
Peter Simons
4db9419a5c gmp: switch default version back to 5.0.5
The 5.1.0 version breaks the build of virtually every package that uses the C++
wrappers for gmp (such as mpfr, ppl, etc).
2013-01-11 17:08:25 +01:00