William A. Kennington III
baf30718ca
Merge branch 'master.upstream' into staging.upstream
2015-11-18 02:36:33 -08:00
Pascal Wittmann
7fd2796e99
Replace 'with plaforms; platform' with 'platforms.platform'
2015-11-17 21:30:43 +01: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
Eelco Dolstra
99fe4f97c5
xz: Update to 5.2.2
2015-10-30 13:18:21 +01:00
Vladimír Čunát
daa543a455
gzip: split man and info outputs
2015-10-28 10:09:33 +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
Tobias Geerinckx-Rice
249b25698e
xdelta: tidy up
2015-08-03 01:41:55 +02:00
Tobias Geerinckx-Rice
c0f59dc0bb
lz4: remove test restrictions
...
Tests are still disabled by default.
2015-07-31 02:02:07 +02:00
Tobias Geerinckx-Rice
08f866d887
xdelta: 3.0.9 -> 3.0.10
2015-07-27 01:54:08 +02:00
Tobias Geerinckx-Rice
e0038d7571
lz4 130 -> 131
...
Changes:
- liblz4: xxhash symbols are dynamically changed (namespace
emulation) to avoid symbol conflict
- liblz4.a (static library) no longer compiled with -fPIC by
default
2015-06-30 09:49:52 +02:00
William A. Kennington III
7a0bbce2e6
lz4: Don't test by default as it takes forever
2015-06-24 17:51:59 -07:00
Tobias Geerinckx-Rice
98b2d7b727
Separate nativeBuildInputs where maintainers |= nckx
2015-06-17 22:21:32 +02:00
Pascal Wittmann
62d62b6588
Fixed some licenses
2015-06-10 13:00:42 +02:00
Bob van der Linden
e593a8d3bf
zopfli: removed roconnor as a maintainer
...
roconnor was added as a maintainer by accident
2015-06-08 19:41:45 +02:00
Arseniy Seroka
944972ba4a
Merge pull request #8199 from bobvanderlinden/zopfli
...
added zopfli package
2015-06-07 01:13:58 +03:00
Bob van der Linden
a818dba90b
added zopfli package
2015-06-06 23:59:51 +02:00
Tobias Geerinckx-Rice
d904b54c0e
lz4: fix make test
...
I'll assume this is an oversight due to hasty releasing and can be
reverted in version 131.
2015-05-30 21:09:26 +02:00
Tobias Geerinckx-Rice
cbbd7230ac
lz4 129 -> 130
...
Hotfix, solving issues with lz4cat.
- Fixed: incompatibility sparse mode vs console (#105 )
- Fixed: LZ4IO exits too early when frame crc not present (#106 )
- Fixed: incompatibility sparse mode vs append mode (#110 )
- Performance fix: big compression speed boost for clang (+30%)
- New: cross-version test
2015-05-30 21:09:25 +02:00
Tobias Geerinckx-Rice
158e1cfdd0
Don't use "with licenses;" for single licences
...
And don't use square brackets on such lines.
2015-05-28 19:20:29 +02:00
Florian Friesdorf
6756d7cdf8
cygwin: gzip fpending
2015-05-28 10:53:35 +02:00
Tobias Geerinckx-Rice
b2d7f4b1ba
Use common licence attributes from lib/licenses.nix
...
Many (less easily automatically converted) old-style strings
remain.
Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.
Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Pascal Wittmann
bb9e9cc3f8
Turned some meta.maintainers into lists
2015-05-14 19:09:43 +02:00
Tobias Geerinckx-Rice
a989b629d9
lz4 128 -> 129
...
- New: LZ4_compress_fast()
- Changed: New lz4 and lz4hc compression API. Previous function
prototypes still supported.
- Changed: Sparse file support enabled by default
- New: LZ4 CLI improved performance compressing/decompressing multiple
files
- Added: LZ4_compress_destSize()
- Fixed: GCC 4.9+ vector optimization
- Changed: Enums converted to LZ4F_ namespace convention
- Added: AppVeyor CI environment, for Visual tests
- Modified:Obsolete functions generate warnings
- Fixed : Bug #75 (unfinished stream)
- Updated: Documentation converted to MarkDown format
2015-05-12 18:13:05 +02:00
Vladimír Čunát
3b9ef2c71b
fix "libc}/lib" and similar references
...
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
Vladimír Čunát
375bc8def7
Merge staging into closure-size
2015-05-05 11:49:03 +02:00
Thomas Tuegel
1fe28a1132
Merge remote-tracking branch 'upstream/master' into staging
2015-04-29 11:33:28 -05:00
Pascal Wittmann
f99d5cf2fc
Fixed some descriptions
2015-04-28 10:55:20 +02:00
Vladimír Čunát
30f31c9afc
Merge 'master' into staging
...
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Tobias Geerinckx-Rice
fbeb8bd898
lz4, xdelta: explicitly mark test requirements as such in code
2015-04-19 03:45:58 +02:00
Vladimír Čunát
a99e543c36
bzip2: split into multiple outputs, refactor
2015-04-18 19:32:52 +02: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
Tobias Geerinckx-Rice
bf2a5a8665
xdelta 3.0z -> 3.0.9
2015-04-17 00:46:21 +02:00
Thomas Tuegel
88918e10e9
Merge branch 'master' into staging
2015-04-10 07:45:38 -05:00
Tobias Geerinckx-Rice
1926a7aa32
Tidy nckx-maintained packages
...
- Use fetchFromGitHub when possible
- Build in parallel if supported
2015-04-08 02:29:42 +02:00
Eric Seidel
6ec373d776
Merge branch master into staging
2015-04-06 18:58:08 -07:00
Tobias Geerinckx-Rice
f97f3d7a1b
lz4 127 -> 128
...
Tests now fail when run in parallel. Don't.
2015-04-01 20:23:47 +02:00
William A. Kennington III
fa2e5b25ba
Merge branch 'master' into staging
2015-03-29 14:25:48 -07:00
Nikolay Amiantov
9ed21f3a49
lbzip2: style fix
2015-03-29 13:05:28 +03:00
William A. Kennington III
4ec8ce4432
xz: 5.2.0 -> 5.2.1
2015-03-25 22:42:24 -07:00
Michael Raskin
e68b486f6e
update lrzip
2015-03-21 21:29:40 +03:00
Eelco Dolstra
2ed5c2bd6b
Set some meta.platforms
...
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Michael Raskin
eeac4fdf0e
update zpaq
2015-03-09 01:03:01 +03:00
Edward Tjörnhammar
33a8a51657
fetchurl: collate samba project urls into a mirror
2015-02-08 22:29:27 +01:00
Shea Levy
c45372f038
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
...
Partial staging merge, including cc-wrapper fixes
Conflicts:
pkgs/applications/audio/spotify/default.nix
pkgs/build-support/cc-wrapper/default.nix
pkgs/development/compilers/cryptol/1.8.x.nix
2015-02-02 21:14:28 -05:00
Peter Simons
520cba52fc
pigz: update from 2.3.1 to 2.3.3, potentially fixes CVE-2015-1191
2015-01-27 14:04:54 +01:00
Eelco Dolstra
0caae022fd
xz: Update to 5.2.0
2015-01-26 23:48:56 +01:00
Tobias Geerinckx-Rice
d14ba81572
lz4: run tests
...
Data safety > valgrind.
2015-01-20 07:31:00 +01:00
Tobias Geerinckx-Rice
8257ed81c9
Add lz4: very fast lossless compression
2015-01-13 23:54:02 +01:00
Spencer Whitt
8b6e6e93b1
Add package 'dtrx'
2015-01-06 14:41:23 -05:00
Tobias Geerinckx-Rice
c64257b8e5
Fix user-facing typos (mainly in descriptions)
2014-12-30 03:31:03 +01:00
Eelco Dolstra
a0f3faf34e
Merge remote-tracking branch 'origin/glibc-2.20' into staging
2014-11-16 22:17:36 +01:00
Eelco Dolstra
0518ccf5af
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0
Turn more licenses into lib.licenses style
...
Should eval cleanly, as far as -A tarball tells me.
Relevant: issue #2999 , issue #739
2014-11-06 00:48:16 +00: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
Eelco Dolstra
7495c61d49
Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
...
Conflicts:
pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Arseniy Seroka
2b61f0b204
Merge pull request #4772 from abbradar/lbzip2
...
lbzip2: add package
2014-11-02 22:38:39 +03:00
Peter Simons
a9c53037fa
Merge remote-tracking branch 'origin/master' into staging.
2014-11-02 16:15:53 +01:00
lethalman
a63cf7a1fa
Merge pull request #4771 from abbradar/pbzip2-update
...
pbzip2: update package
2014-11-02 00:52:28 +01:00
Nikolay Amiantov
b6529ce1f6
lbzip2: add package
2014-11-02 02:05:54 +03:00
Nikolay Amiantov
f2a27d8d81
pbzip2: update package
2014-11-02 02:04:36 +03:00
Igor Pashev
ce5cc9d803
Added pxz
2014-11-01 18:59:20 +01:00
Eelco Dolstra
5cc92eb0d8
Remove obsolete useDietLibC stdenv adapter
2014-10-29 13:43:00 +01:00
Eelco Dolstra
09dc132e04
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/development/libraries/poppler/default.nix
2014-10-16 15:16:50 +02:00
Longrin Wischnewski
6e7de2155b
change md5sum to sha256sum for a few packages
2014-10-12 16:13:21 +02:00
Eelco Dolstra
811de3bfaa
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
...
Conflicts:
pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Aristid Breitkreuz
2c107b86f6
remove unused parameter from gzip derivation
2014-10-08 20:23:27 +02:00
Aristid Breitkreuz
51c97e8e8f
lzip: update from 1.15 to 1.16
2014-10-07 21:50:40 +02:00
Eelco Dolstra
a6ddb9243d
xz: Update to 5.0.7
2014-10-06 20:51:51 +02:00
Eelco Dolstra
cd71f7a2e6
Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
...
Conflicts:
pkgs/development/interpreters/ruby/ruby-19.nix
pkgs/development/libraries/libc++/default.nix
pkgs/development/libraries/libc++abi/default.nix
pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
Eelco Dolstra
91ec6e0d90
Merge remote-tracking branch 'origin/master' into staging
2014-09-18 22:28:35 +02:00
Michael Raskin
d78973078a
Adding AdvanceCOMP deflate compression optimizer
2014-09-17 11:27:13 +04:00
Gergely Risko
e6bf8a09ba
Fix xz to not depend on bootstrap-tools
2014-09-14 21:00:12 +02:00
Eric Seidel
0577499d74
fix some packages on darwin
2014-09-09 13:54:26 -07:00
Peter Simons
1c0d15b90e
Merge branch 'origin/master' into staging.
...
Conflicts:
pkgs/development/libraries/ffmpeg/2.x.nix
pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02: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
Daniel Peebles
3182cf00ff
Add xar
2014-08-30 22:52:46 +01:00
Vladimír Čunát
030af0a803
fix .xz in stdenv bootstrap
...
Presumably needed due to the last staging merge.
There was some stdenv stage refactoring within, IIRC.
2014-08-30 15:48:17 +02:00
Vladimír Čunát
e51f73652d
Merge recent master into staging
...
Hydra: ?compare=1149952
Conflicts:
nixos/doc/manual/configuration.xml (changed split file)
nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +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
Vladimír Čunát
4dccb224c5
WIP2
2014-08-26 01:10:56 +02:00
Vladimír Čunát
3ec413cece
WIP
2014-08-25 15:30:46 +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
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
Luca Bruno
b83aceaecb
Merge branch 'master' into staging
2014-08-14 23:09:59 +02:00
Sander van der Burg
ba54614773
kzipmix: create package
2014-08-14 16:10:30 +02:00
Gergely Risko
59291fdbf4
Get rid of bootstrap-tools dependency from xz (and therefore stdenv)
...
0769fc5b77
broke this by setting CONFIG_SHELL.
2014-08-14 02:06:44 +02:00
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
aszlig
625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
...
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.
The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.
Conflicts:
pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
Austin Seipp
960690e931
bsdiff: adopt and clean up
...
Bonus: simpler build, and should fix the build of bsdiff for Darwin
(patch taken from homebrew).
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-03-28 18:52:37 -05: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
Lluís Batlle i Rossell
5d8ca218df
upx: updating to 3.91.
2014-02-04 10:12:28 +01:00
Eelco Dolstra
e07ce3314d
Fix some "meta.licenses" attributes
2014-01-25 03:04:46 +01:00
Vladimír Čunát
0a58b512cb
Merge master into stdenv-updates
...
Conflicts (simple):
pkgs/development/compilers/gcc/4.8/default.nix
pkgs/development/compilers/llvm/default.nix
pkgs/development/libraries/gmp/5.1.1.nix
pkgs/development/libraries/gmp/5.1.3.nix
pkgs/development/libraries/gmp/5.1.x.nix
pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Peter Simons
088b35edfb
pigz: update to version 2.3.1
2014-01-13 17:05:45 +01:00
Peter Simons
44df3d7799
lzip: update to version 1.15
2014-01-13 17:05:45 +01:00
Eelco Dolstra
a9a3ed1084
gzip: Don't depend on stdenv-linux.
...
Issue #1469 .
2014-01-07 17:50:30 +01:00
Eelco Dolstra
c17e263ae9
gzip: Don't depend on less
...
No need to make stdenv bootstrap more bloated than necessary.
2014-01-07 14:12:10 +01:00
Vladimír Čunát
e740b565cf
Merge master into stdenv-updates
...
Conflicts (easy):
pkgs/development/compilers/llvm/default.nix
pkgs/development/compilers/openjdk/default.nix
pkgs/development/libraries/icu/default.nix
pkgs/development/libraries/libssh/default.nix
pkgs/development/libraries/libxslt/default.nix
pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Nixpkgs Monitor
7af191826e
upx: update from 3.07 to 3.09
2013-12-21 02:28:28 +02:00
Mathijs Kwik
db83d9a35b
Merge branch 'master' into multiple-outputs
2013-11-01 08:29:09 +01:00
Peter Simons
91f2c362de
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Michael Raskin
8c94c3ad08
Updating lrzip to 0.616
2013-10-20 21:10:02 +04:00
Peter Simons
6be8ad3392
Merge branch 'origin/master' into stdenv-updates.
...
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Jaka Hudoklin
9239b6df47
Add gzrt, gzip Recovery Toolkit
2013-10-17 18:35:24 +02:00
Eelco Dolstra
81a647696e
xz: Update to 5.0.5
2013-08-26 14:25:51 +02:00
Eelco Dolstra
2d405ed4d5
xz: Split into multiple outputs
2013-08-26 12:05:16 +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
Peter Simons
522acfd2f4
Merge remote-tracking branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/applications/version-management/git-and-tools/git/default.nix
pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
Evgeny Egorochkin
da4be371e9
make package use mirror:// for gnu, savannah and gnome repositories where possible
2013-07-14 05:23:06 +03:00
Evgeny Egorochkin
b084b29d26
Even more mirror:// fixes
2013-07-14 04:17:07 +03:00
Vladimír Čunát
4a7696589d
gzip: update 1.5 -> 1.6, use less in tests now
2013-06-30 08:59:29 +02:00
Peter Simons
728e305205
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-05-22 12:30:02 +02:00
Lluís Batlle i Rossell
d72da0329d
zsync: update to 0.6.2
2013-05-17 23:48:22 +02: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
Peter Simons
5f758431d4
lzip: build the binary with -O3 and assertions disabled
2013-03-13 15:13:40 +01:00
Peter Simons
c187516152
lzip: enable documentation build
2013-03-13 15:13:40 +01:00
Peter Simons
6d5c6af427
lzip: update to version 1.14
2013-03-13 13:59:33 +01:00
Michael Raskin
b494b3b468
Update lrzip
2013-03-09 16:33:14 +04:00
Danny Wilson
fcce211c8e
Fix GZip build on Illumos
2013-02-28 20:04:02 +01:00
Eelco Dolstra
2aa6f262cb
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-02-15 13:36:34 +01:00
Peter Simons
6b702f23ea
lzip: add version 1.14-rc3
2013-02-06 13:15:12 +01:00
Eelco Dolstra
68da39a63f
xz: Update to 5.0.4
2012-09-18 14:52:41 -04:00
Eelco Dolstra
51a6b27cc7
gzip: Update to 1.5
...
This fixes the gets() problem in gzip.
Also disabled "make check" because it depends on Perl and more/less,
which is undesirable in the stdenv bootstrap.
2012-09-18 14:30:19 -04:00
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