Commit graph

45 commits

Author SHA1 Message Date
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
Dan Peebles
6f2ab634f9 bzip2: fix shared library generation on darwin
This fixes #6504
(cherry picked from commit 31ab7d38f2)
2016-02-13 17:20:44 +01:00
Dan Peebles
31ab7d38f2 bzip2: fix shared library generation on darwin
This fixes #6504
2016-02-13 10:31:36 -05:00
Bojan Nikolic
9f2cc14107 bzip2: Fix cross-compilation
The cross-compiling the "patchPhase" from the parent attribute set was
preventing application of patches specified in the crossDrv. Fix by
turning patchPhase into postPatch.
2016-02-11 15:31:16 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
janus
a1ade02cdc FreeBSD support 2016-01-01 16:59:48 +00:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Matthias C. M. Troffaes
aeb3d8ce4c bzip2: fix cross build on mingw by using autoconf patch 2015-11-23 11:25:03 +00:00
Matthias C. M. Troffaes
5f25c63bfd Revert "bzip2: fix cross build on mingw by using autoconf patch"
This reverts commit 094c374941.
2015-11-23 11:23:37 +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
Matthias C. M. Troffaes
094c374941 bzip2: fix cross build on mingw by using autoconf patch 2015-11-18 16:33:36 +00:00
aszlig
96648a8526
bzip2: Get rid of the custom builder.sh.
Everything the builder.sh did can be done with the generic builder which
makes it easier to override attributes and also easier to read.

The reason I've done this is because of #10820, which tries to override
the preBuild hook, but the latter is hardcoded in the builder.sh of
bzip2.

I have compared the output of this against the previous version and the
only things that were different were timestamps in libbz2.a.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-11-17 16:25:56 +01:00
Vladimír Čunát
a99e543c36 bzip2: split into multiple outputs, refactor 2015-04-18 19:32:52 +02:00
Eelco Dolstra
a0f3faf34e Merge remote-tracking branch 'origin/glibc-2.20' into staging 2014-11-16 22:17:36 +01:00
Eelco Dolstra
5cc92eb0d8 Remove obsolete useDietLibC stdenv adapter 2014-10-29 13:43:00 +01:00
Eric Seidel
0577499d74 fix some packages on darwin 2014-09-09 13:54:26 -07:00
aszlig
423be7712b
bzip2/cross: Patch out erroneous path separator.
Not sure why this even got into the upstream release, as _all_ other
includes use forward slashes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:23 +01:00
Eelco Dolstra
33090b2198 * bzip2 updated to 1.0.6 (with a fix for CVE-2010-0405).
svn path=/nixpkgs/branches/stdenv-updates/; revision=30853
2011-12-12 17:06:31 +00:00
Peter Simons
b2ae5a5ba9 pkgs/tools/compression/bzip2: move --mandir into standard location $out/share/man
svn path=/nixpkgs/branches/stdenv-updates/; revision=25007
2010-12-06 17:48:52 +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
d0cdb3a02a pkgs/tools/compression/bzip2: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=24142
2010-10-07 13:14:25 +00:00
Peter Simons
5b87d8b27d pkgs/tools/compression/bzip2: completed meta section
svn path=/nixpkgs/trunk/; revision=24138
2010-10-07 13:14:09 +00:00
Lluís Batlle i Rossell
19b9811012 Making a bunch of basic programs cross-buildable.
After this, the 'bootstrap-tools' can be cross-built.


svn path=/nixpkgs/branches/stdenv-updates/; revision=20945
2010-04-04 18:10:42 +00:00
Lluís Batlle i Rossell
4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Eelco Dolstra
1c623126c7 * Use the sh from klibc in the bootstrap. It's a lot smaller than
bash.  Also, use the cpio from klibc instead of tar.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13905
2009-01-29 17:48:45 +00:00
Eelco Dolstra
cd60dc0ede * Various updates.
svn path=/nixpkgs/branches/stdenv-updates/; revision=12051
2008-06-12 09:49:40 +00:00
Yury G. Kudryashov
4d5a4ea903 More homepages
svn path=/nixpkgs/trunk/; revision=10419
2008-01-31 10:11:09 +00:00
Eelco Dolstra
fba07b7840 * bzip2 1.0.4 (NIXPKGS-57).
svn path=/nixpkgs/trunk/; revision=8744
2007-05-24 13:37:03 +00:00
Eelco Dolstra
f6d923febc * Merge builder-cygwin.sh.
svn path=/nixpkgs/trunk/; revision=7497
2006-12-27 17:58:32 +00:00
Eelco Dolstra
1ace3742a3 * Fix bzip2 on cygwin.
svn path=/nixpkgs/trunk/; revision=7025
2006-11-13 23:01:35 +00:00
Eelco Dolstra
66fb5088c5 * Doh.
svn path=/nixpkgs/trunk/; revision=6837
2006-10-24 23:05:53 +00:00
Eelco Dolstra
97a65f81b2 * Unify the bzip2 builders.
svn path=/nixpkgs/trunk/; revision=6833
2006-10-24 22:40:33 +00:00
Eelco Dolstra
f3619824a9 * bzip2 with dietlibc.
svn path=/nixpkgs/trunk/; revision=6767
2006-10-18 15:49:47 +00:00
Eelco Dolstra
fbf526d408 * Use stdenv.isDarwin.
svn path=/nixpkgs/trunk/; revision=5728
2006-07-17 11:07:32 +00:00
Eelco Dolstra
e410c935a1 * Treat i686-darwin as powerpc-darwin.
svn path=/nixpkgs/trunk/; revision=5604
2006-07-06 09:30:40 +00:00
Eelco Dolstra
46a15b49a0 * Ugh, bzip2 should be autotooled...
svn path=/nixpkgs/trunk/; revision=5357
2006-05-31 15:07:56 +00:00
Eelco Dolstra
a276487772 * Doh!
svn path=/nixpkgs/trunk/; revision=4739
2006-02-06 12:48:07 +00:00
Eelco Dolstra
e12399051a * Grmbl.
svn path=/nixpkgs/trunk/; revision=4738
2006-02-06 12:44:34 +00:00
Eelco Dolstra
4d91fa9c45 * Quick hack to get bzip2 to build on Darwin.
svn path=/nixpkgs/trunk/; revision=4737
2006-02-06 12:29:36 +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
a450978f26 * Glibc updated to 2.3.5.
* GCC 3.4.4 and 3.3.6.
* Other stdenv packages updated.

svn path=/nixpkgs/trunk/; revision=3188
2005-06-17 10:30:13 +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
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/tools/compression/bzip2/default.fix (Browse further)