3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

202 commits

Author SHA1 Message Date
Peter Simons d5677fe6c7 stdenv-updates: merge updates from 'master' branch 2012-09-11 16:48:41 +02:00
Shea Levy 8480a90d1e bzip2: Keep libbz2.so.1.0 around.
Some packages (e.g. libarchive) try to link there. Reported by jack_c in IRC.
2012-07-12 14:28:19 -04:00
Lluís Batlle i Rossell 3bdc4b417f lrzip: adding an upstream patch that fixes its md5 checksum.
The next version will have this fix already.
2012-07-05 09:56:22 +02:00
Shea Levy 015e7594d0 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2012-07-02 11:27:25 -04:00
Ludovic Courtès e80145b909 tar, gzip: Adjust the `gets' patch.
Fixes the incorrect patches introduced in
9786a98261.
2012-07-02 16:10:46 +02:00
Ludovic Courtès 9786a98261 tar, gzip, diffutils: Allow builds with newer versions of glibc.
This is a follow-up to 77fdc7bb35 ("GNU
Coreutils: Allow builds with newer versions of glibc.").
2012-07-01 01:14:56 +02:00
Shea Levy 8cc0edaeba Merge branch 'master' into stdenv-updates
ssp is disabled for glibc-2.13 unconditionally
2012-06-27 13:48:22 -04:00
Antono Vasiljev 1fb5c38fce Updated ncompress url (prev version missing on mirrors) (Fixes #21) 2012-06-24 16:37:32 +03:00
Eelco Dolstra 0f4d6b791e * bzip2 installs a weird libbz2.so.1.0 symlink, which should be
libbz2.so.1.  And libbz2.so should link to libbz2.so.1.0.6.

svn path=/nixpkgs/branches/stdenv-updates/; revision=34095
2012-05-14 21:57:18 +00:00
Peter Simons 7a4f8c97c5 pigz: updated to version 2.2.4
svn path=/nixpkgs/trunk/; revision=34058
2012-05-11 12:16:09 +00:00
Lluís Batlle i Rossell 2523c0b9d1 Updating lrzip to 0.612.
svn path=/nixpkgs/trunk/; revision=33991
2012-05-05 15:50:31 +00:00
Yury G. Kudryashov 57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Lluís Batlle i Rossell f20a947a5d Updating lzop
svn path=/nixpkgs/trunk/; revision=32730
2012-03-01 22:03:34 +00:00
Eelco Dolstra c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00: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
Ludovic Courtès 0baf364715 XZ Utils 5.0.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=29846
2011-10-14 21:56:07 +00:00
Lluís Batlle i Rossell 074ef3fd85 Updating lrzip
svn path=/nixpkgs/trunk/; revision=27304
2011-05-25 22:19:53 +00:00
Lluís Batlle i Rossell 6aa761ab3b Removing a superfluous argument in upx
svn path=/nixpkgs/trunk/; revision=26621
2011-03-31 10:04:52 +00:00
Lluís Batlle i Rossell 56acf8aeb0 Updating upx (and I tried to make it use fine lzma and ucl)
svn path=/nixpkgs/trunk/; revision=26620
2011-03-31 09:49:54 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
2010-12-11 12:47:00 +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
Eelco Dolstra aa01c8abd6 * Added xdelta.
svn path=/nixpkgs/trunk/; revision=24907
2010-11-28 16:37:48 +00:00
Michael Raskin 293704a6f8 Fix the makefile
svn path=/nixpkgs/branches/stdenv-updates/; revision=24816
2010-11-22 23:16:05 +00:00
Lluís Batlle i Rossell a38202bc8b Updating xz to a stable version. Not beta anymore. (more stdenv rebuild)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24483
2010-10-26 08:33:18 +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 02bd68fa15 Removing a gzip patch we had, as it looks like being in the new upstream release.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23307
2010-08-21 15:36:48 +00:00
Ludovic Courtès e0fa7776d3 GNU gzip 1.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23278
2010-08-20 15:26:26 +00:00
Lluís Batlle i Rossell 86345919c2 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=22254
2010-06-14 09:28:10 +00:00
Lluís Batlle i Rossell 6c4cb05613 Adding zsync
svn path=/nixpkgs/trunk/; revision=22158
2010-06-05 19:23:57 +00:00
Lluís Batlle i Rossell 4328f6a1fe Updating bsdiff
svn path=/nixpkgs/trunk/; revision=22156
2010-06-05 11:40:23 +00:00
Lluís Batlle i Rossell fa1a414aee Merging from trunk - I had to resolve conflicts on coreutils; I hope I resolved that
well


svn path=/nixpkgs/branches/stdenv-updates/; revision=21975
2010-05-25 20:38:18 +00:00
Eelco Dolstra 81cd88d83d * Remove a bunch of empty files/directories.
svn path=/nixpkgs/trunk/; revision=21911
2010-05-20 10:51:19 +00:00
Lluís Batlle i Rossell 6f2fac6466 Merging from trunk.
I hope I resolved the conflicts well (gmp and gccCross)


svn path=/nixpkgs/branches/stdenv-updates/; revision=21251
2010-04-22 21:44:33 +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
Ludovic Courtès 525274bd94 xz: Fix x86_64-darwin builds.
svn path=/nixpkgs/trunk/; revision=20916
2010-04-01 14:52:14 +00:00
Ludovic Courtès dd5de51265 ncompress 4.2.4.3.
svn path=/nixpkgs/trunk/; revision=20712
2010-03-17 14:44:42 +00:00
Lluís Batlle i Rossell 4e59f00501 I added again nasm as lrzip input. It is required in i686-linux at least.
svn path=/nixpkgs/trunk/; revision=20467
2010-03-07 22:46:29 +00:00
Lluís Batlle i Rossell 7a2ad368f9 Updating lrzip. It does not depend on nasm anymore.
svn path=/nixpkgs/trunk/; revision=20463
2010-03-07 21:03:50 +00:00
Lluís Batlle i Rossell 75e0d28624 Updating upx - now it builds with gcc 4.4
svn path=/nixpkgs/trunk/; revision=20160
2010-02-22 08:08:23 +00:00
Lluís Batlle i Rossell 40985548d1 Merging from Oleksandr:
Updating some gnome packages and pigz.


svn path=/nixpkgs/trunk/; revision=20154
2010-02-21 12:25:36 +00:00
Eelco Dolstra a617a7c239 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
2010-02-03 14:23:43 +00:00
Rob Vermaas 13417770a3 applying patches provided by griswold
svn path=/nixpkgs/trunk/; revision=19707
2010-01-27 12:12:35 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Rob Vermaas 675a8ed9d8 ncompress provided by griswold
svn path=/nixpkgs/trunk/; revision=19410
2010-01-13 21:11:48 +00:00
Lluís Batlle i Rossell 5bae851b1e Merging from trunk. I had to give away some structure to build the native
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
2009-12-19 11:14:16 +00:00
Eelco Dolstra 93db6f4cf8 * Removed the lzma package - it's superseded by xz.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19027
2009-12-18 11:25:56 +00:00
Lluís Batlle i Rossell 4174b1a061 Adding pbzip2 (Parallel bzip2 for multicore machines)
svn path=/nixpkgs/trunk/; revision=19011
2009-12-17 11:10:01 +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 e5b02bca70 * Add a missing version number.
svn path=/nixpkgs/trunk/; revision=17988
2009-10-28 12:29:13 +00:00
Peter Simons 49a1368712 pigz: an implementation of gzip that can take advantage of multi-core CPUs
Initial version.

svn path=/nixpkgs/trunk/; revision=17707
2009-10-07 20:18:11 +00:00
Sander van der Burg 7fa38ea9fa Added XZ package
svn path=/nixpkgs/trunk/; revision=16989
2009-09-08 20:03:37 +00:00
Michael Raskin 90b06b47bb tukaani.org is down...
svn path=/nixpkgs/trunk/; revision=15503
2009-05-08 03:47:08 +00:00
Eelco Dolstra 7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra d27514cb28 * Sync with the trunk once more.
* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
2009-03-31 15:30:47 +00:00
Lluís Batlle i Rossell 701e3ee6b9 Adding lzop and updating lzo.
svn path=/nixpkgs/trunk/; revision=14749
2009-03-28 19:28:59 +00:00
Lluís Batlle i Rossell d52b60af22 Adding upx.
svn path=/nixpkgs/trunk/; revision=14645
2009-03-22 13:03:37 +00:00
Eelco Dolstra d8e436c742 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14634
2009-03-20 16:49:02 +00:00
Lluís Batlle i Rossell 7fd91b8736 Adding lrzip and rzip.
svn path=/nixpkgs/trunk/; revision=14581
2009-03-17 21:17:51 +00:00
Eelco Dolstra f468a5597a * Install a libbz2.so symlink. Otherwise, programs that link against
-lbz2 will get libbz2.a, which is generally not what we want.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14307
2009-03-03 10:42:51 +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 d73c2175e0 * lzma 4.32.7.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13818
2009-01-21 16:07:31 +00:00
Eelco Dolstra cd60dc0ede * Various updates.
svn path=/nixpkgs/branches/stdenv-updates/; revision=12051
2008-06-12 09:49:40 +00:00
Michael Raskin 4df190c703 Various fixes and updates to build that all.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10568
2008-02-10 16:44:43 +00:00
Eelco Dolstra 8cd1b893cf * coreutils-6.10, findutils-4.2.32.
* Added some meta attributes.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10511
2008-02-06 13:18:50 +00:00
Yury G. Kudryashov 891295a46a More homepages
svn path=/nixpkgs/branches/stdenv-updates/; revision=10432
2008-01-31 10:42:02 +00:00
Michael Raskin 77a46300fa Added patch from Gentoo for glibc 2.6 compatibility. It just randomly renames an inner function, so glibc 2.5-safe.
svn path=/nixpkgs/trunk/; revision=9441
2007-10-11 03:41:29 +00:00
Eelco Dolstra a0159dee8e * Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl
URLs to http://nix.cs.uu.nl/dist/tarballs.  With content-addressable
  mirror support (r9190, NIXPKGS-70) this is no longer necessary:
  fetchurl will try to download from that location automatically.  So
  we can keep the original URLs.

svn path=/nixpkgs/trunk/; revision=9192
2007-08-24 12:32:36 +00:00
Eelco Dolstra b216fc8bc4 * gzip 1.3.12 (NIXPKGS-53). Note that gunzip and zcat are scripts
now instead of (sym)links.

svn path=/nixpkgs/trunk/; revision=8745
2007-05-24 13:38:12 +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
Armijn Hemel 7e41b751cb new versions of various very important tools to keep the buildfarm busy.
svn path=/nixpkgs/trunk/; revision=7485
2006-12-25 23:28:35 +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 0b7e256162 * Hook variables in the generic builder are now executed using eval.
This has a major advantage: you can write hooks directly in Nix
  expressions.  For instance, rather than write a builder like this:

    source $stdenv/setup

    postInstall=postInstall
    postInstall() {
        ln -sf gzip $out/bin/gunzip
        ln -sf gzip $out/bin/zcat
    }

    genericBuild

  (the gzip builder), you can just add this attribute to the
  derivation:

    postInstall = "ln -sf gzip $out/bin/gunzip; ln -sf gzip $out/bin/zcat";

  and so a separate build script becomes unnecessary.  This should
  allow us to get rid of most builders in Nixpkgs.

* Allow configure and make arguments to contain whitespace.
  Previously, you could say, for instance

    configureFlags="CFLAGS=-O0"

  but not

    configureFlags="CFLAGS=-O0 -g"

  since the `-g' would be interpreted as a separate argument to
  configure.  Now you can say

    configureFlagsArray=("CFLAGS=-O0 -g")

  or similarly

    configureFlagsArray=("CFLAGS=-O0 -g" "LDFLAGS=-L/foo -L/bar")

  which does the right thing.  Idem for makeFlags, installFlags,
  checkFlags and distFlags.

  Unfortunately you can't pass arrays to Bash through the environment,
  so you can't put the array above in a Nix expression, e.g.,

    configureFlagsArray = ["CFLAGS=-O0 -g"];

  since it would just be flattened to a since string.  However, you
  can use the inline hooks described above:

    preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")";


svn path=/nixpkgs/trunk/; revision=6863
2006-10-26 22:20:25 +00:00
Eelco Dolstra 45bf677dcc * Doh.
svn path=/nixpkgs/trunk/; revision=6859
2006-10-26 19:00:46 +00:00
Eelco Dolstra 29f9225a9d * Symlink gunzip, zcat.
svn path=/nixpkgs/trunk/; revision=6857
2006-10-26 14:35:57 +00:00
Eelco Dolstra 66fb5088c5 * Doh.
svn path=/nixpkgs/trunk/; revision=6837
2006-10-24 23:05:53 +00:00
Eelco Dolstra de70885cfc * No longer needed.
svn path=/nixpkgs/trunk/; revision=6834
2006-10-24 22:41:38 +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
Armijn Hemel dde6370c2a add a statically linked bzip2. This is the last of the tools we need for a fullystatic initial stdenv...
svn path=/nixpkgs/trunk/; revision=4477
2006-01-01 13:34:35 +00:00
Armijn Hemel abcfd1bce5 add static version for initial stdenv
svn path=/nixpkgs/trunk/; revision=4444
2005-12-27 02:50:48 +00:00
Eelco Dolstra 82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Eelco Dolstra 454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra 0a2f531aea * Don't patch symlinked shared libraries.
svn path=/nixpkgs/trunk/; revision=3195
2005-06-17 13:46:04 +00:00
Eelco Dolstra 98761b883a * Build bzip2 shared library.
svn path=/nixpkgs/trunk/; revision=3194
2005-06-17 13:39:06 +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 1d9072670b * Added bsdiff 4.2. Wow, this is even better than zdelta (which in
turn appears to be better than vdelta).

svn path=/nixpkgs/trunk/; revision=1819
2004-11-29 21:17:29 +00:00
Eelco Dolstra 9ebbbd25cc * Added zdelta 2.1.
svn path=/nixpkgs/trunk/; revision=1817
2004-11-29 19:35:42 +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
Eelco Dolstra 48c3faca51 * Renamed pkgs-ng to pkgs.
svn path=/nixpkgs/trunk/; revision=502
2003-11-14 09:59:13 +00:00