Commit graph

45 commits

Author SHA1 Message Date
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
aszlig
e64b342fa8
Use mingw-w64 for 32bit Windows builds as well.
Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And
because our Windows cross builds were also poorly maintained and most of
the cross-tests were broken as well, I'm just taking this step and try
to switch to mingw-w64 for everything "cross Windows".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 22:38:48 +01:00
aszlig
d0142e9b09
pcre/cross: Enable support for winpthreads.
That way we're able to build with the JIT compiler enabled.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:24 +01:00
Peter Simons
bccc76f290 pcre: update to version 8.34 2014-01-13 17:05:07 +01:00
Vladimír Čunát
59a5f6307d pcre: disable tests for freeBSDs, as we're running out of stack 2013-10-08 20:58:34 +02:00
Vladimír Čunát
8a0931c5c3 pcre: minor update 8.32 -> 8.33 2013-06-30 09:00:11 +02:00
Eelco Dolstra
afebababac pcre: Split into multiple outputs 2013-06-11 15:28:30 +02:00
Danny Wilson
867ea1f8fe Update to PCRE 8.32 with JIT enabled 2013-02-28 20:04:02 +01:00
Peter Simons
592e4abe2b pcre: update library to version 8.31 2012-11-21 16:08:01 +01:00
Ludovic Courtès
0524b60614 PCRE: Disable tests on Cygwin.
svn path=/nixpkgs/trunk/; revision=34219
2012-05-24 15:03:54 +00:00
Eelco Dolstra
bad4ed8717 * PCRE updated to 8.21. Also enable Unicode support by default, since
it only increases the size of the library a little bit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30886
2011-12-14 13:36:38 +00:00
Lluís Batlle i Rossell
fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Peter Simons
d095fbb13e pkgs/development/libraries/pcre: fixed build on Darwin
The gcc version used on Darwin crashes while compiling the C++ interface
of PCRE. Building that code with -O0 avoids the crash.

svn path=/nixpkgs/trunk/; revision=24107
2010-10-06 10:29:45 +00:00
Peter Simons
2291f661b0 pkgs/development/libraries/pcre: fixed misspelled CPPFLAGS
svn path=/nixpkgs/branches/stdenv-updates/; revision=24082
2010-10-05 15:35:55 +00:00
Peter Simons
d61c959049 pkgs/development/libraries/pcre: merged recent changes from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24076
2010-10-05 13:57:31 +00:00
Eelco Dolstra
d845bf6b8c * Revert last two commits, they should be in the stdenv-branch.
svn path=/nixpkgs/trunk/; revision=24075
2010-10-05 13:49:54 +00:00
Peter Simons
dd6e852f3e pkgs/development/libraries/pcre: enable regression test suite
svn path=/nixpkgs/trunk/; revision=24074
2010-10-05 13:48:37 +00:00
Peter Simons
5649af8523 pkgs/development/libraries/pcre: fixed build on Darwin
The gcc version used on Darwin fails to compile the C++ interface to the PCRE
library when optimizations are enabled. Building C++ code with -O0 remedies the
problem. This is unsatisfactory, though, because the resulting library is
likely to perform more poorly than it would if built with -O2 or -O3.

svn path=/nixpkgs/trunk/; revision=24072
2010-10-05 13:45:53 +00:00
Peter Simons
1171bb1dca pkgs/development/libraries/pcre: updated to version 8.10
svn path=/nixpkgs/branches/stdenv-updates/; revision=24070
2010-10-05 13:16:53 +00:00
Peter Simons
00dd2f39ed pkgs/development/libraries/pcre: updated the meta section and enabled hydra builds of this package
svn path=/nixpkgs/trunk/; revision=24069
2010-10-05 13:12:49 +00:00
Peter Simons
5a928cc584 pkgs/development/libraries/pcre: updated to version 8.02
svn path=/nixpkgs/branches/stdenv-updates/; revision=21908
2010-05-20 10:32:56 +00:00
Eelco Dolstra
94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Eelco Dolstra
51760b17b3 * PCRE 7.8.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14710
2009-03-25 17:41:02 +00:00
Eelco Dolstra
e31341510d * Merged from the trunk. Let's see how well this works with
Subversion 1.5...

svn path=/nixpkgs/branches/stdenv-updates/; revision=13601
2008-12-10 09:59:21 +00:00
Eelco Dolstra
19ebc883e1 * pcre 7.8.
svn path=/nixpkgs/branches/stdenv-updates/; revision=12984
2008-10-07 12:41:36 +00:00
Eelco Dolstra
700677583c * Revert - this needs to go to the stdenv branch (I'll create it
tomorrow).

svn path=/nixpkgs/trunk/; revision=12965
2008-10-05 21:16:30 +00:00
Pjotr Prins
859162564f Bumped pcre version
svn path=/nixpkgs/trunk/; revision=12947
2008-10-05 08:44:09 +00:00
Eelco Dolstra
5168fde6a6 * Revert to 7.4 (but with an updated URL) since pcre is a part of
stdenv.  Time to reopen the stdenv branch?

svn path=/nixpkgs/trunk/; revision=12838
2008-09-10 11:33:46 +00:00
Peter Simons
be4bb6f4de libpcre: update from 7.4 to 7.8
Version 7.4 of libpcre is no longer available for download at the
specified location, so I updated to version 7.8, which is the latest
one.

svn path=/nixpkgs/trunk/; revision=12835
2008-09-09 19:09:55 +00:00
Eelco Dolstra
8b3186528e * pcre: don't compile with C++ support when doing a dietlibc build.
* GCC 4.2: restore the ability to build a statically linked compiler,
  needed for the Nixpkgs bootstrap.
* GCC 4.2: use symlinks instead of hard links in $out/bin
  (NIXPKGS-62).

svn path=/nixpkgs/branches/stdenv-updates/; revision=9771
2007-11-21 19:28:54 +00:00
Eelco Dolstra
b37f504680 * Updated various stdenv packages (grep, gawk, tar, cpio, findutils,
pcre).

svn path=/nixpkgs/branches/stdenv-updates/; revision=9758
2007-11-19 17:39:19 +00:00
Yury G. Kudryashov
82b608d93f Added optional unicode support to pcre. Building old (non-unicode) package by
default.

svn path=/nixpkgs/trunk/; revision=9386
2007-10-01 15:07:55 +00:00
Eelco Dolstra
c62a35fc0c * pcre updated to 7.1 (NIXPKGS-58).
svn path=/nixpkgs/trunk/; revision=8747
2007-05-24 13:41:25 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Armijn Hemel
5579c5d330 6.6 -> 6.7
svn path=/nixpkgs/trunk/; revision=5633
2006-07-06 22:17:04 +00:00
Eelco Dolstra
ffb94e0690 * Latest versions.
svn path=/nixpkgs/trunk/; revision=5482
2006-06-21 15:54:46 +00:00
Eelco Dolstra
3389f4bc36 * Copy lots of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=4623
2006-01-30 16:04:03 +00:00
Eelco Dolstra
94fe7734fa * Glibc 2.3.6.
* GCC 3.4.5.
* Updated several other stdenv packages.
* Modified the builders of several packages to use the generic
  builder.

svn path=/nixpkgs/trunk/; revision=4336
2005-12-06 00:12:45 +00:00
Eelco Dolstra
b8bae3582b * Lots of updates, especially GTK and X libraries.
svn path=/nixpkgs/trunk/; revision=3193
2005-06-17 11:43:15 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Eelco Dolstra
e31d1dd960 * Pcre updated to 4.5.
svn path=/nixpkgs/trunk/; revision=1443
2004-09-18 17:14:22 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Dolstra
5941f66f0e * The stdenv setup script now defines a generic builder that allows
builders for typical Autoconf-style to be much shorten, e.g.,

    . $stdenv/setup
    genericBuild

  The generic builder does lots of stuff automatically:

  - Unpacks source archives specified by $src or $srcs (it knows about
    gzip, bzip2, tar, zip, and unpacked source trees).
  - Determines the source tree.
  - Applies patches specified by $patches.
  - Fixes libtool not to search for libraries in /lib etc.
  - Runs `configure'.
  - Runs `make'.
  - Runs `make install'.
  - Strips debug information from static libraries.
  - Writes nested log information (in the format accepted by
    `log2xml').

  There are also lots of hooks and variables to customise the generic
  builder.  See `stdenv/generic/docs.txt'.

* Adapted the base packages (i.e., the ones used by stdenv) to use the
  generic builder.

* We now use `curl' instead of `wget' to download files in `fetchurl'.

* Neither `curl' nor `wget' are part of stdenv.  We shouldn't
  encourage people to download stuff in builders (impure!).

* Updated some packages.

* `buildinputs' is now `buildInputs' (but the old name also works).

* `findInputs' in the setup script now prevents inputs from being
  processed multiple times (which could happen, e.g., if an input was
  a propagated input of several other inputs; this caused the size
  variables like $PATH to blow up exponentially in the worst case).

* Patched GNU Make to write nested log information in the format
  accepted by `log2xml'.  Also, prior to writing the build command,
  Make now writes a line `building X' to indicate what is being
  built.  This is unfortunately often obscured by the gigantic tool
  invocations in many Makefiles.  The actual build commands are marked
  `unimportant' so that they don't clutter pages generated by
  `log2html'.


svn path=/nixpkgs/trunk/; revision=845
2004-03-19 16:53:04 +00:00
Eelco Dolstra
026ff9466a * Rename .fix -> .nix.
svn path=/nixpkgs/trunk/; revision=511
2003-11-18 12:12:56 +00:00
Renamed from pkgs/development/libraries/pcre/default.fix (Browse further)