Commit Graph

64 Commits

Author SHA1 Message Date
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
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
Peter Simons
3b4bf9cee3 gmp: version 5.1.0 has the cpu-id patch applied already 2013-01-11 17:08:24 +01:00
Peter Simons
996da754e4 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 16:15:16 +01:00
Peter Simons
b7e2799d32 gmp: version 5.1.0 has the cpu-id patch applied already 2013-01-11 15:52:42 +01:00
Lluís Batlle i Rossell
2839c45d97 gmp: Adding more urls for 5.1.0
It worked some days ago, but gnu mirrors seem to have removed gmp 5.1.0
2013-01-06 14:06:36 +00:00
Peter Simons
796b5e3c9f gmp-5.x: update from 5.0.5 to 5.1.0 2013-01-04 20:38:11 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
72684fb42f Remove support for the obsolete powerpc-darwin and i686-darwin platforms 2012-11-29 14:10:49 +01:00
Ludovic Courtès
5debe94bb3 gmp: don't build fat binaries on Solaris 2012-07-07 00:59:40 +02:00
Eelco Dolstra
ab55de20c1 * GMP 5.0.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34007
2012-05-07 20:03:12 +00:00
Eelco Dolstra
29b0341589 * GMP updated to 5.0.4.
* By default, QEMU's CPUID identifies the CPU as GenuineIntel, family
  6, model 2.  Since there never was a physical 64-bit CPU like that,
  64-bit GMP calls abort().  This causes every program linked against
  libgmp to fail under QEMU (unless an appropriate -cpu or -M flag is
  used), which is rather bad, especially for users of hosting
  providers who cannot change QEMU's flags.  The patch causes GMP to
  be more liberal (i.e., use non-CPU-specific implementations).

svn path=/nixpkgs/branches/stdenv-updates/; revision=33531
2012-04-01 22:17:00 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Peter Simons
12e953b944 gmp: updated (unused) version 5.0.1 to 5.0.3
svn path=/nixpkgs/trunk/; revision=31908
2012-01-28 14:37:53 +00:00
Peter Simons
37d2e2e917 gmp: renamed nix files to conform with coding guidelines
svn path=/nixpkgs/trunk/; revision=31903
2012-01-28 10:20:50 +00:00
Eelco Dolstra
03fb0e59ef * Fix GHC. The bootstrap binaries depend on libgmp.so.3, which is
provided by GMP 4 but not GMP 5.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31639
2012-01-18 18:43:34 +00:00
Eelco Dolstra
cfde88976b * Streamline the stdenv bootstrap and resulting closure by removing
some redundant builds (e.g., GMP was built three times).
* Updated GMP to 5.0.2.
* Updated PPL to 0.11.2.
* Remove ad hoc flags to build GCC's dependencies statically.
  Instead, use the ‘makeStaticLibraries’ stdenv adapter.
* Build GMP with C++ support by default.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30891
2011-12-14 14:31:56 +00:00
Shea Levy
4d70ba6cc9 Merge from trunk up through r28790
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
Ludovic Courtès
7762934904 BDW-GC, GMP, libffi, libunistring, Readline: Don't use the native `strip'.
Using the native `strip' breaks static libraries when cross-compiling.

svn path=/nixpkgs/trunk/; revision=27572
2011-07-01 13:20:12 +00:00
Ludovic Courtès
d00b303766 GMP: Use --enable-fat' instead of tinkering with config.guess'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=27126
2011-05-03 22:38:52 +00:00
Ludovic Courtès
3593d48524 GMP: Further attempt to fix `x86_64-darwin' builds.
svn path=/nixpkgs/trunk/; revision=25668
2011-01-22 20:26:50 +00:00
Lluís Batlle i Rossell
50f337ad01 Making gcc not depend on bootstrap-tools (by a postInstall patchelf trick)
svn path=/nixpkgs/branches/stdenv-updates/; revision=22963
2010-08-05 13:39:08 +00:00
Lluís Batlle i Rossell
e0a11f532b Trying to bootstrap gcc 4.5 with ppl, so it does not depend on libstdc++ from the boostrap-tools.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22947
2010-08-04 12:36:35 +00:00
Peter Simons
70240d36ac Enable parallel building of gcc, glibc, gmp, mpfr, coreutils, perl, git, and qt4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=22400
2010-06-23 14:35:18 +00:00
Lluís Batlle i Rossell
3f77d3da03 I downgrade ppl again to the stable release, and I make gmp 4.3.2 the default
gmp; we can update all once we have stable ppl 0.11 and a working cloog-ppl
with all that.
This way we should at least gcc4.5 building with ppl/cloog-ppl


svn path=/nixpkgs/branches/stdenv-updates/; revision=22271
2010-06-15 09:14:16 +00:00
Lluís Batlle i Rossell
e31361657c Updating gmp and ppl (this last, mandatory, to match the gmp version).
I chose a snapshot of the future 0.11 ppl (that had to be released one or two
months ago, I think), waiting for the 0.11 to be frozen. Only 0.11 supports
building with gmp 5.x



svn path=/nixpkgs/branches/stdenv-updates/; revision=22268
2010-06-14 21:44:38 +00:00
Ludovic Courtès
d3292f42a2 GMP 5.0.0.
svn path=/nixpkgs/branches/stdenv-updates/; revision=20586
2010-03-11 23:24:56 +00:00
Ludovic Courtès
0c17cced16 GMP: Build on all platforms.
svn path=/nixpkgs/trunk/; revision=19955
2010-02-12 14:14:45 +00:00