BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
111205 commits 1 branch 0 tags 3.8 GiB
Commit graph

456 commits

Author SHA1 Message Date
Nathan Zadoks
1072e2bf4d fish: don't use manpath(1) from PATH in functions/man.fish 
Close #12762.
 2016-02-02 06:13:12 +01:00
Robin Gloster
f6d3b7a2ae switch hardening flags 2016-01-30 16:36:57 +00:00
Franz Pletz
954e9903ad Use a hardened stdenv by default 2016-01-30 16:36:57 +00:00
Tobias Geerinckx-Rice
9fb8020e4e Add version attribute where maintainers |= nckx 
This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
 2016-01-25 17:35:21 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Jakob Gillich
5e5ecb7b6f fish: fix merge conflict 
patches got duplicated
 2016-01-05 23:32:29 +01:00
Arseniy Seroka
1fc685ae64 Merge pull request #11945 from jgillich/fish 
fish: add module to support it as default shell
 2016-01-06 01:25:37 +03:00
Nikolay Amiantov
e312276b01 Merge pull request #12000 from nathan7/nix-auto-run 
command-not-found: add NIX_AUTO_RUN option, to automatically invoke nix-shell
 2016-01-03 03:22:50 +03:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size 
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
 2015-12-31 09:53:02 +01:00
Nathan Zadoks
efd9562df0 fish: pass all of argv to command-not-found 2015-12-28 15:09:48 +01:00
Jakob Gillich
ac7e923104 fish: add module to support it as default shell 
* Patched fish to load /etc/fish/config.fish if it exists (by default,
  it only loads config relative to itself)
* Added fish-foreign-env package to parse the system environment

closes #5331
 2015-12-26 06:25:23 +01:00
Vladimír Čunát
11c702c582 Merge master into staging 2015-12-23 18:57:35 +01:00
Matthijs Steen
f2a9837113 grml-zsh-config: init at 0.12.4 2015-12-17 16:29:00 +01:00
Vladimír Čunát
1c268e0b8c Merge master into staging 2015-12-17 08:53:35 +01:00
Tobias Geerinckx-Rice
75df6e05c3 mksh: maintainers += nckx 2015-12-14 23:34:34 +01:00
Tobias Geerinckx-Rice
d0323d406a mksh: 51 -> 52 
‘This release has a nonzero chance to break existing scripts that
use some extension features – I had to quote some tildes in
dot.mkshrc and a variable expansion in ${x/y"$z"} in MirWebseite
(the $z) – twice!. As usual, test!’

-- https://www.mirbsd.org/permalinks/news_e20151212-tg.htm
 2015-12-14 23:34:24 +01:00
Alexander Shabalin
020a09adbb fish: Use /bin/hostname on darwin. Fixes #11012. 2015-12-13 22:52:35 +03:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Pascal Wittmann
68a1b2411a zsh: 5.1.1 -> 5.2 2015-12-05 17:07:41 +01:00
Vladimír Čunát
476c96b5c6 Merge master into staging 
Taken the version from recent channel bump, as it's well-tested.
Close #11460.
 2015-12-05 10:26:06 +01:00
Burke Libbey
3c437a643f GNU apparently modified bash patch 042. 2015-12-03 08:58:30 +01:00
Daniel Peebles
539c1d1b2c Revert "Update bash patches" 2015-12-02 19:10:06 -05:00
Burke Libbey
4007b3a251
GNU apparently modified bash patch 042. 2015-12-01 23:04:43 -05:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Vladimír Čunát
10135e6f41 fish: use absolute path to clear when pressing ^L 
It was unable to find `clear` for me.
/cc maintainer @ocharles.
 2015-11-29 12:01:17 +01:00
Christian Albrecht
97332d30f6 zsh: re-enable tests skipping broken 
Do not disable all tests, only those broken as zsh/zpty module is not
available on hydra.
 2015-11-26 09:59:27 +00:00
Pascal Wittmann
380ed0229c pash: clean up meta information 2015-11-25 23:06:09 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Spencer Whitt
0b0e51ce6f nix-zsh-completions: init at 0.2 2015-11-24 18:50:02 -05: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
Friedrich von Never
1c3b6a2812 pash: init at git-2015-11-06 2015-11-19 23:00:56 +06:00
Samuel Rivas
d3ed672b6a fish: fix use hostname from the store instead of from the environment 2015-11-06 09:55:55 +01:00
Pascal Wittmann
0c5bdf68c2 fix: substitute path to bc in math.fish 
closes #10141
 2015-11-05 15:14:04 +01:00
Vladimír Čunát
6d6f8282f4 bash: remove bashbug for non-interactive, refactor 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
William A. Kennington III
773b4deb7c Merge commit 'a6f6c0e' into master.upstream 
This is a partial merge of staging where we have up to date binaries for
all packages.
 2015-09-15 12:16:49 -07:00
Pascal Wittmann
f24e989fd2 zsh: 5.1 -> 5.1.1 2015-09-12 11:58:57 +02:00
Pascal Wittmann
c11dc40d09 Merge pull request #9254 from FRidh/jupyter 
ipython: 3.2 -> 4.0
 2015-09-08 17:43:21 +02:00
Pascal Wittmann
fe3609b646 [zsh] disable tests again, they fail on hdyra 2015-09-08 12:45:33 +02:00
Pascal Wittmann
092a5eea28 zsh: enable tests 2015-09-06 19:04:55 +02:00
Pascal Wittmann
78b33072d8 zsh: update from 5.0.8 to 5.1 2015-09-06 19:04:55 +02:00
William A. Kennington III
461a9ee562 bash4.3: p39 -> p42 2015-08-31 10:25:12 -07:00
William A. Kennington III
883fadf6d1 bash: Remove stale 4.1 patches 2015-08-31 10:23:01 -07:00
Frederik Rietdijk
3ccedc7630 python-packages ipython: 3.2 -> 4.0 2015-08-29 10:36:42 +02:00
Jude Taylor
9c153e2227 add binutils to bash build for size 2015-08-12 11:27:54 -07:00
William A. Kennington III
0ecc61b4d7 Merge branch 'master.upstream' into staging.upstream 2015-08-05 16:24:57 -07:00
Frederik Rietdijk
3944e4f980 ipython: 3.1 -> 3.2.1 2015-08-05 23:09:28 +02:00
Eelco Dolstra
e1f78bf677 More docs/manpages in separate outputs 2015-07-27 00:27:54 +02:00
William A. Kennington III
25e60feb72 Merge branch 'master.upstream' into staging.upstream 2015-07-15 02:02:46 -07:00
Tobias Geerinckx-Rice
94c94926f5 mksh 50d -> 51 
R51 is a strongly recommended feature release.
Changes: <https://www.mirbsd.org/mksh.htm#clog>.

Release number changed to match Nix versioning rules ("R51" -> 51).

cc maintainer @AndersonTorres
 2015-07-15 03:31:54 +02:00
Maciek Starzyk
ad4e17e94b fish: Fixed "Could not autoload item 'seq'..." 2015-07-14 21:44:25 +02:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
lethalman
624fe6a290 Merge pull request #8774 from mstarzyk/fish-shell 
fish: 2.1.2 -> 2.2.0
 2015-07-13 13:38:23 +02:00
Tuomas Tynkkynen
5c08963fed xonsh: Don't use fetchurl on dynamically generated GitHub tarballs 
Just use fetchFromGitHub instead.
 2015-07-12 21:03:27 +02:00
Maciek Starzyk
dcc2b6148e fish: 2.1.2 -> 2.2.0 2015-07-12 15:33:01 +02:00
Thomas Tuegel
a8c52d0958 Merge branch 'master' into staging 2015-06-25 09:15:05 -05:00
Tommy M. McGuire
2d7da5a62e es: bugfix for man page install 
See Issue #8487.
 2015-06-24 11:36:02 -05:00
William A. Kennington III
282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Eelco Dolstra
7c3bf186a6 bash: Update to 4.3-p39 2015-06-22 14:40:29 +02:00
Jascha Geerds
3f66bb7ff2 Add myself as maintainer 2015-06-22 08:26:09 +02:00
Pascal Wittmann
6ceecb5548 zsh: update from 5.0.7 to 5.0.8 
add myself as maintainer
 2015-06-08 12:55:38 +02:00
Rok Garbas
bd59bf9a74 cygwin: bash updated to 4.3 for cygwin platform 2015-05-29 10:18:06 +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
Marko Durkovic
67ac12795a cygwin: add cygwin compatible bash version. 2015-05-28 10:53:35 +02:00
Mateusz Kowalczyk
d17429142b Merge pull request #7903 from joelmo/patch-3 
ipython: comments about deprecated pylab flag
 2015-05-26 11:00:36 +01:00
Eric Seidel
c95e489149 fish: dont demand man-db on darwin since we cant build it 2015-05-23 13:48:54 -07:00
Joel Moberg
9b03663f9e ipython: comments about deprecated pylab flag 
The pylab flag is deprecated: http://mail.scipy.org/pipermail/ipython-dev/2014-March/013411.html
 2015-05-19 15:31:37 +02:00
Vladimír Čunát
375bc8def7 Merge staging into closure-size 2015-05-05 11:49:03 +02:00
Utku Demir
ebe3802a8f pythonPackages.ipython: 2.3.1 -> 3.1.0 2015-05-02 22:05:07 +02:00
Tobias Geerinckx-Rice
3b611e3a0a mksh: clarify that it's Free 2015-04-30 13:11:31 +02:00
Joachim Fasting
8488d133f3 meta.licenses -> license 2015-04-21 23:10:07 +02:00
Eelco Dolstra
61cca2cadf meta.homePage -> homepage 2015-04-20 14:20:03 +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
Stewart Mackenzie
768b804e2f new package: es 2015-04-11 12:22:43 +08:00
Spencer Whitt
a1044bd26e xonsh: new package 2015-03-26 14:25:17 -04: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
koral
43505edb9c fish: 2.1.1 -> 2.1.2 2015-03-05 01:55:45 +01:00
Dan Peebles
7cc575c870 Fish wants libiconv too, even though it won't admit it 2015-02-18 01:14:36 -05:00
Peter Simons
3d8b3fe253 Merge pull request #6319 from sorokin/master 
bash-completion: fix bad array subscript error. Closes #6117
 2015-02-12 20:33:21 +01:00
Ivan Sorokin
20ab4027da bash-completion: fix bad array subscript error. Closes #6117 2015-02-12 22:18:17 +03: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
Eelco Dolstra
a628d6ee18 bash: Update to 4.3-p30 2015-01-26 23:42:36 +01:00
AndersonTorres
58061d9ede MKSH (version R50d): New Package 
MKSH is the MirBSD Korn Shell.
 2015-01-25 22:09:44 -02:00
Vincent Laporte
81a2b58c39 nixpkgs: remove redundant attribute sip 
Because:

 1. It is a mere alias of `pythonPackages.sip`
 2. It is usually not needed since propagated by `pyqt4`
 3. It makes it easy to have a packages depend on two different versions
 of sip
 2014-12-23 19:37:21 +01:00
Pascal Wittmann
f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Domen Kožar
4aa3eec330 Merge branch 'master' into staging 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
 2014-12-07 14:02:48 +01:00
Bjørn Forsman
5224a44d00 ipython: update 2.2.0 -> 2.3.1 
Changelog:
  http://ipython.org/ipython-doc/2/whatsnew/version2.0.html
 2014-12-06 15:14:52 +01:00
Eelco Dolstra
103f5658a4 bash: Update to 4.3 2014-11-03 14:19:53 +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
Pascal Wittmann
164a6f878c zsh: update from 5.0.6 to 5.0.7 2014-10-09 09:43:33 +02:00
Georges Dubus
d2c09be961 Merge pull request #4403 from jagajaga/fish_update 
update fish shell to 2.1.1
 2014-10-07 17:43:38 +02:00
Eelco Dolstra
a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
 2014-10-07 00:09:37 +02:00
Arseniy Seroka
97f04baaa9 update fish shell 2014-10-07 01:00:37 +04:00
Eelco Dolstra
635ca3094f bash: Update to 4.2p53 2014-10-06 20:20:04 +02:00
Peter Simons
88ef0cb750 bash: add patch set 51 to fix http://lcamtuf.blogspot.de/2014/10/bash-bug-how-we-finally-cracked.html 2014-10-01 23:02:56 +02:00
Mateusz Kowalczyk
bed76a5c89 dash: update from 0.5.7 to 0.5.8 2014-09-30 10:29:50 +01:00
Shell Turner
21c12b4065 Updated bash to patch 50. 
This fully mitigates Shellshock and related parsing vulnerabilities,
due to attackers never controlling environment variable names.
 2014-09-29 13:44:38 +02:00
muflax
9d9258be5c zsh: bump version 2014-09-27 08:33:32 +01:00
muflax
368d0b4213 zsh: enable pcre 2014-09-27 08:33:29 +01:00
Eelco Dolstra
0a0ebd8c44 bash: Fix for CVE-2014-7169 2014-09-25 14:40:44 +02:00
Shell Turner
ad3591cd9d Update bash patchset to fix CVE-2014-6271 2014-09-24 17:09:12 +02:00
Bernerd Schaefer
bba65ab7a5 fishshell builds on unix platforms 2014-09-16 09:04:55 +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
Vladimír Čunát
fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +02:00
Domen Kožar
cb3cf6d3d7 pythonPackges.ipython: 2.0.0 -> 2.2.0 2014-08-25 11:01:31 +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
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra
66fb10ecb5 rush: Fix build on Linux 
http://hydra.nixos.org/build/12922354
 2014-08-08 17:59:02 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
 2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/misc/vim-plugins/default.nix
 2014-07-22 11:00:00 +02:00
Joel Taylor
3bc13f1c58 allow zsh on mac 2014-07-17 15:38:19 -07:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/servers/serfdom/default.nix
 2014-07-01 11:25:41 +02:00
Bjørn Forsman
8727f1aeb1 fish: fix 'fish_config' by providing python ncurses module 
Gets rid of the "ImportError: No module named _curses" (and failure to
display page) when clicking the "prompt" page in the 'fish_config' web
UI.
 2014-06-30 20:39:02 +02:00
Eelco Dolstra
01449afa1b bash: Update to 4.2-p47 2014-06-24 13:53:59 +02:00
Bjørn Forsman
52561fb7a8 zsh: improve description 
Capitalize first word. Wrap overlong longDescription line.
 2014-06-23 13:07:28 +02:00
Georges Dubus
927c41e258 fish: Fixed tab completion with sudo (close #2705) 
We don't have /sbin and /usr/sbin, so fish complains.
 2014-06-10 11:36:12 +02:00
Bjørn Forsman
f4cc9c29c7 ipython: update 1.1.0 -> 2.0.0 
Release notes:
http://ipython.org/ipython-doc/2/whatsnew/version2.0.html

Build and run tested terminal mode (default), notebook, qtconsole; all
works. (And the release notes list few backwards incompatible changes.)
 2014-04-13 21:55:27 +02:00
Peter Simons
cf5ac3bded zsh: update from 5.0.2 to 5.0.5 2014-04-09 12:41:10 +02:00
William A. Kennington III
bf3ca4cb48 fish: Fix propagatedBuildInputs and other assorted changes 
Currently, fish does not depend on python27 which is necessary for many
of the built in commands such as the manpage completion generator and
the web configuration sevice. This patch adds support for python27 as
well as man_db for the manpage completion generator. It also attempts to
replace more shell functions with binaries contained in the nix store.
 2014-02-15 12:17:06 +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
Peter Simons
df80be16d2 dash: enable Hydra builds on Linux 2013-12-21 00:05:38 +01:00
Nixpkgs Monitor
0abf7e6224 dash: update from 0.5.6 to 0.5.7 2013-12-18 18:18:24 +02:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. 
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
 2013-12-04 18:33:52 +01:00
Oliver Charles
b97e4a1ac6 fish: Update to 2.1.0 (close #1261) 2013-11-23 11:09:09 +01:00
Peter Simons
ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Domen Kožar
9f7a56dcb6 Merge pull request #1014 from coroa/scipy 
Updating scipy and friends to add the new package qutip
 2013-09-26 12:09:20 -07:00
Bjørn Forsman
5cffa00443 fish: add missing deps 
Start fish and run "ls". It will complain about not being able to run
which, nroff and gettext. This fixes it.
 2013-09-25 22:41:39 +02:00
Bjørn Forsman
3382de06fd fish: add (more) meta attributes 2013-09-25 22:08:40 +02:00
Jonas Hoersch
ec486f6a7e ipython: update to version 1.1.0 2013-09-17 16:41:15 +02:00
Peter Simons
3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Danie Roux
63a2b95c21 zsh: Upgrade to 5.0.2 2013-09-01 16:46:21 +02:00
Eelco Dolstra
2145471304 bash: Update to 4.2-p45 2013-08-26 14:28:56 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Bjørn Forsman
53fe67e74d ipython: 0.13.2 -> 1.0.0 
Release notes:
http://ipython.org/ipython-doc/rel-1.0.0/whatsnew/version1.0.html
 2013-08-14 19:16:22 +02:00
Peter Simons
dc1d57e3d3 ipython: update to version 0.13.2 2013-07-23 14:15:30 +02:00
Oliver Charles
49d0f50f0c fish: Add fish 2.0.0 2013-06-04 10:20:30 +01:00
Rob Vermaas
4ed7c2f334 Fix another maintainers attribute 2013-05-21 09:27:35 +02:00
Bjørn Forsman
05bb66ce20 Add myself as maintainer for several packages 
And set missing meta.platforms for the packages I've added earlier.
 2013-05-20 20:28:15 +02:00
Peter Simons
735aae5b7a bash-completion: update to version 2.1 2013-04-10 17:39:09 +02:00
Bjørn Forsman
25c49767f3 ipython: modularize and enable more features 
Add these new attributes (all default to true):

  notebookSupport
  qtconsoleSupport
  pylabSupport
  pylabQtSupport

This adds jinja2, matplotlib, pyqt4 and sip as new dependencies of
ipython.

This commit fixes "ipython --pylab" so that it no more errors out with
"ImportError: No module named matplotlib" (which was my initial goal).
 2013-03-27 15:39:03 +01:00
Bjørn Forsman
66969547a2 ipython: bump to 0.13.1 
IPython 0.13.1: minor bugfix release for 0.13, on October 20, 2012. This
release includes 41 Pull Requests and closing 21 Issues backported from
0.14-dev, including significant fixes for ipcluster and Python 3.3
compatibility.
 2013-03-27 12:09:55 +01:00
Rok Garbas
fb127d28cb ipython: adding depenencies for ipython's notebook 2013-03-23 00:38:18 +01:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Peter Simons
07fb82aef3 bash-completion: update to current git HEAD at 2.0-95-gd08b9f2 
The 2.0 release is 7+ months old, and there has been lots of activity since.
 2013-01-30 12:25:11 +01:00
Eelco Dolstra
0214514f8b bash: Disable parallel building 
Parallel building randomly fails because bash's Makefiles at some
point do a recursive make invocation to build a file "version.h":

  ../version.h: ../config.h ../Makefile Makefile
          -( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} version.h )

As a result, both the parent and the child can end up building
version.h at the same time.  This causes the build to fail with

  mv: cannot stat `newversion.h': No such file or directory

http://hydra.nixos.org/build/3853249
 2013-01-23 16:32:57 +01:00
Eelco Dolstra
b4dd943f16 bash: Update to 4.2-p42 2013-01-17 12:39:48 +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
4065ae9174 bash: Update to 4.2-p39 2012-11-23 17:29:05 +01:00
Peter Simons
f67d5a9a39 Merge branch 'master' into stdenv-updates. 
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
 2012-11-21 16:20:36 +01:00
Peter Simons
31b7510e22 bash-completion: remove NixOS-specific patch 
The new bash-completion support in NixOS doesn't require this patch anymore.
Besides, the patch was insufficient for most purposes anyway: Bash completion
modules are spread out over all user profiles listed in $NIX_PROFILES (plus the
current-system profile), so getting full support for all installed modules
requires support for more than one "bash_completion.d" directory anyway.
 2012-10-16 18:26:02 +02:00
Peter Simons
d5677fe6c7 stdenv-updates: merge updates from 'master' branch 2012-09-11 16:48:41 +02:00
Peter Simons
970a326ebb bash-completion: automatically source any completion files that the user might have installed in ~/.nix-profile/etc/bash_completion.d 2012-08-20 16:36:20 +02:00
Peter Simons
a886d4f2ab bash-completion: update to version 2.0 
Please note that this update changes the directory structure quite a bit. In
particular, the file "/etc/bash_completion" no longer exists, which means that
shell code which relies on that path must be updated. I'll commit appropriate
changes for NixOS in a moment.
 2012-08-20 10:34:56 +02:00
Eelco Dolstra
fcdfc1c50c bash: Update to 4.2-p37 2012-08-10 14:39:30 -04:00
Shea Levy
f11631c8c4 tcsh: Bump 2012-07-27 19:27:25 -04:00
aszlig
003ea37724 ipython: Update to 0.13. 2012-07-25 18:04:52 +02:00
Eelco Dolstra
69e32e52e2 * Bash 4.2.24. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=33554
 2012-04-03 11:48:31 +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
Yury G. Kudryashov
08761e83fc Merge trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
 2012-01-02 14:12:40 +00:00
Florian Friesdorf
89c3120b20 zsh profile load tweaking only on nixos 
svn path=/nixpkgs/trunk/; revision=31149
 2011-12-29 20:09:30 +00:00
Florian Friesdorf
0009c1f650 zshprofile to load /etc/profile while emulating bash 
svn path=/nixpkgs/trunk/; revision=31148
 2011-12-29 19:46:47 +00:00
Florian Friesdorf
ecba799e78 zsh meta 
svn path=/nixpkgs/trunk/; revision=31147
 2011-12-29 19:46:43 +00:00
Florian Friesdorf
c6ad751a8c zsh-4.3.15 
svn path=/nixpkgs/trunk/; revision=31146
 2011-12-29 19:46:37 +00:00
Eelco Dolstra
1dbbc4581b * Latest bash patches. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30854
 2011-12-12 17:10:28 +00:00
Peter Simons
7edf0e8eaf synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29870
 2011-10-18 08:47:36 +00:00
Cillian de Roiste
13e76321f0 Updating IPython (python shell) to 0.11 
svn path=/nixpkgs/trunk/; revision=29858
 2011-10-16 12:46:47 +00:00
Peter Simons
07a5a121fb synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29524
 2011-09-28 14:48:34 +00:00
Peter Simons
dc55be9e05 pkgs/shells/bash: updated "interactive" bash to version 4.2 
The non-interactive variant, which is part of stdenv, remains unchanged.

svn path=/nixpkgs/trunk/; revision=29523
 2011-09-28 14:37:03 +00:00
Peter Simons
6a1bde84dc pkgs/shells/bash/default.nix: don't install bash completion in non-interactive mode 
This patch removes the kludge introduced in trunk to avoid a stdenv rebuild.

svn path=/nixpkgs/branches/stdenv-updates/; revision=29469
 2011-09-24 08:06:47 +00:00
Peter Simons
0ad122f4e6 sync with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29468
 2011-09-24 08:04:47 +00:00
Peter Simons
3e09798bf4 pkgs/shells/bash/default.nix: revert my earlier revision 29244 
Including the bash-completion package in bash itself sounded like a good idea
at the time, but it wasn't. After having actually integrated completion support
into NixOS, it has become obvious that this property isn't required at all.
Keeping bash-completion separate from bash works just fine. Anyone who wants
completion support can just install that package.

svn path=/nixpkgs/trunk/; revision=29467
 2011-09-24 07:58:19 +00:00
Shea Levy
01df54f5cc Merge from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
 2011-09-23 16:58:45 +00:00
Peter Simons
9f20aa5df6 bash: install extensive completion library in the interactive version 
Add the command-line completion library to the "interactive" version of
bash. That code is *not* active by default. To enable it, run

 | . ${bash}/etc/bash_completion

in your ~/.bashrc. If you prefer to build bashInteractive without that
feature, use the following override in ~/.nixpkgs/config.nix to disable it:

 | {
 |   packageOverrides = pkgs:
 |   {
 |     bashInteractive = pkgs.bashInteractive.override {
 |       bashCompletion = null;
 |     };
 |   };
 | }

svn path=/nixpkgs/trunk/; revision=29244
 2011-09-13 17:50:03 +00:00
Peter Simons
7bc8c122bd bash-completion: fixed hard-coded reference to /etc 
svn path=/nixpkgs/trunk/; revision=29226
 2011-09-12 17:31:11 +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
Peter Simons
db86b7f237 all-packages.nix: added package bash-completion 
svn path=/nixpkgs/trunk/; revision=27895
 2011-07-21 22:02:01 +00:00
Eelco Dolstra
f119c267de * getmail: don't use pythonFull. 
svn path=/nixpkgs/branches/modular-python/; revision=26566
 2011-03-28 13:13:15 +00:00
Eelco Dolstra
cef7e52b5a * ipython: simplify. 
svn path=/nixpkgs/branches/modular-python/; revision=26565
 2011-03-28 12:40:53 +00:00
Ludovic Courtès
0f1ba30626 GNU Bash 4.2. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=26119
 2011-02-25 15:28:29 +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
Lluís Batlle i Rossell
1b62c9c061 I made changes to achieve a working cross-built gcc wrapper. Now, 
"gcc45.hostDrv" works in the host system, together with libc, binutils, dynamic
linker, ...


svn path=/nixpkgs/branches/stdenv-updates/; revision=24971
 2010-12-04 21:45:37 +00:00
Peter Simons
50a167ba7b pkgs/shells/ipython: added initial version of ipython 0.10.1 
Committing on behalf of Cillian de Róiste <cillian.deroiste@gmail.com>.

svn path=/nixpkgs/trunk/; revision=24928
 2010-11-29 18:04:56 +00:00
Lluís Batlle i Rossell
ab419e9f86 Adding support for job control in bash cross-building, because otherwise it does not get built. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24890
 2010-11-27 15:49:43 +00:00
Lluís Batlle i Rossell
d910fcbcee Making bash and kbd cross-build 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24851
 2010-11-25 09:14:56 +00:00
Ludovic Courtès
d9e30eb4a4 GNU Rush 1.7. 
svn path=/nixpkgs/trunk/; revision=23257
 2010-08-19 16:55:51 +00:00
Eelco Dolstra
d1ae973761 * Added dash. 
svn path=/nixpkgs/trunk/; revision=22088
 2010-06-01 17:05:29 +00:00
Ludovic Courtès
a174ff34b8 Add GNU SASL, GNU GSS-API, and GNU Rush. 
Contributed by Brian Gough <bjg@gnu.org>.

svn path=/nixpkgs/trunk/; revision=21315
 2010-04-26 08:59:25 +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
Nicolas Pierron
1664ec986a Update zsh. 
svn path=/nixpkgs/trunk/; revision=19740
 2010-01-31 12:13:38 +00:00
Eelco Dolstra
6b4de5c25e * None of us is paying attention today ;-) 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19690
 2010-01-26 20:13:23 +00:00
Ludovic Courtès
6dc132be1e bash: Fix URL. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19688
 2010-01-26 19:41:04 +00:00
Eelco Dolstra
0d88060fb6 * Update to bash-4.1-p2 (since we're rebuilding everything anyway). 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19680
 2010-01-26 16:34:50 +00:00
Rob Vermaas
e8601a4227 explicitly disable readline support for bash on darwin, hacky for now, to avoid massive rebuild 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19678
 2010-01-26 16:04:53 +00:00
Ludovic Courtès
eea396e744 GNU Bash 4.1. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19223
 2010-01-05 11:27:57 +00:00
Ludovic Courtès
2e9a37cce1 bash: Make `update-patch-set.sh' executable. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19221
 2010-01-05 11:27:50 +00:00
Lluís Batlle i Rossell
a5fee3325a Fixing some things on the gcc-cross-wrapper (libc was not properly added to the 
linking path), and with this achieved bash being cross-compilable.
I fixed the few expressions involved in bash building, so they have well stated
native and non-native inputs.

I also tried to cross-build guile, and with this I found a problem in the
actual cross-gcc: it calls the binutils ld, instead of the ld wrapper. This
way, the programs/shared_libraries don't get the proper -rpath.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18497
 2009-11-20 22:56:58 +00:00
Lluís Batlle i Rossell
e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
 2009-11-19 19:09:10 +00:00
Eelco Dolstra
7f5b839524 * Removed selectVersion. There's no good reason to write 
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
 2009-11-18 09:39:59 +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
7442d90d32 * tcsh: create a "csh" symlink. 
svn path=/nixpkgs/trunk/; revision=15950
 2009-06-13 16:09:26 +00:00
Eelco Dolstra
f762b50991 * Another sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
 2009-04-23 11:59:43 +00:00
Lluís Batlle i Rossell
306b6e87a5 Updating tcsh, so its url even works. 
svn path=/nixpkgs/trunk/; revision=15137
 2009-04-18 23:31:45 +00:00
Eelco Dolstra
9d1a6b6c67 * Doh. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=15019
 2009-04-14 07:35:20 +00:00
Eelco Dolstra
e6cf1abcec * bash: updated to 4.0 patchlevel 17. Removed the dietlibc patch, we 
don't need it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15018
 2009-04-13 18:38:45 +00:00
Eelco Dolstra
5e9b323363 * Fixed bashInteractive. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14703
 2009-03-25 15:59:02 +00:00
Ludovic Courtès
73b66bedd9 Remove redundant Bash 4.0 expression. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14663
 2009-03-23 17:33: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
Peter Simons
ae474690ea Added bash 4.0 (and readline 6.0, which is required by bash). 
svn path=/nixpkgs/trunk/; revision=14573
 2009-03-17 14:03:03 +00:00
Ludovic Courtès
a6f044663b GNU Bash 4.0. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=14210
 2009-02-23 21:26:35 +00:00
Eelco Dolstra
a5b607ef4f * Bash 3.2.48. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=13876
 2009-01-27 11:03:41 +00:00
Marc Weber
e4a6036ca9 adding cvs zsh version because it has better hg, tg completion support 
svn path=/nixpkgs/trunk/; revision=13670
 2008-12-22 18:36:26 +00:00
Marc Weber
57c012cd8c zsh update to 4.3.9 
svn path=/nixpkgs/trunk/; revision=13367
 2008-11-22 16:57:16 +00:00
Eelco Dolstra
c441868a7e * bash: use the global /etc/bashrc and /etc/bash_logout files. 
Changed the built-in default $PATH to /no-such-path.  (This also
  applies to the "standard utilities path" used by "command -p", so
  that doesn't work anymore, but it didn't work anyway on NixOS and
  nobody uses it.)  Include the startup files for non-interactive
  login shells.  Use bashrc when started from ssh.

svn path=/nixpkgs/trunk/; revision=12365
 2008-07-16 15:05:49 +00:00
Eelco Dolstra
dd91141a06 * bash needs texinfo if you want the manpages / info docs. 
svn path=/nixpkgs/trunk/; revision=12363
 2008-07-16 13:36:41 +00:00
Nicolas Pierron
a160e0ff22 Update zsh mirror. (patch from Bárður Árantsson) 
svn path=/nixpkgs/trunk/; revision=12192
 2008-06-26 07:49:02 +00:00
Eelco Dolstra
90f1d76790 * Bash 3.2 patchlevel 39. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=11799
 2008-05-09 14:55:03 +00:00
Yury G. Kudryashov
b7b4efd867 Added socat, updated zsh 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10575
 2008-02-10 17:36:10 +00:00
Eelco Dolstra
a18e6606c8 * Bash 3.2 updated to patch level 33. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10512
 2008-02-06 13:26:27 +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
a7703662a4 Merged with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=10145
 2008-01-15 00:55:21 +00:00
Eelco Dolstra
d0fc2251b4 * Bash 3.2 patchlevel 25. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=9795
 2007-11-26 13:59:46 +00:00
Eelco Dolstra
8f4d8573c0 * Fix a bunch of URLs. 
svn path=/nixpkgs/trunk/; revision=9292
 2007-09-11 10:15:07 +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
Michael Raskin
6296d1a64f Version bump. Old one is unavailable. 
svn path=/nixpkgs/trunk/; revision=9001
 2007-07-18 20:34:18 +00:00
Yury G. Kudryashov
2d0d0e8fbf * zsh upgraded to 4.3.2, lua upgraded to 5.1.2 (works only on linux now) 
svn path=/nixpkgs/trunk/; revision=8990
 2007-07-17 16:43:06 +00:00
Michael Raskin
d80093f2ff Added version suffixes. 
svn path=/nixpkgs/trunk/; revision=8921
 2007-06-26 12:13:17 +00:00
Michael Raskin
0432c3cf1c Added zsh 
svn path=/nixpkgs/trunk/; revision=8900
 2007-06-20 10:02:10 +00:00
Eelco Dolstra
d384ef5673 * Replace bash with bash-interactive. 
svn path=/nixpkgs/trunk/; revision=8761
 2007-05-24 15:44:03 +00:00
Eelco Dolstra
5021babc20 svn path=/nixpkgs/trunk/; revision=8760 2007-05-24 15:43:00 +00:00
Eelco Dolstra
30cde36de1 * Bash updated to 3.2 patchlevel 17. 
svn path=/nixpkgs/trunk/; revision=8746
 2007-05-24 13:40:39 +00:00
Eelco Dolstra
b6195120a4 * Add bashInteractive to the channel. 
svn path=/nixpkgs/trunk/; revision=8539
 2007-04-04 10:31:09 +00:00
Eelco Dolstra
6c6ff6f36f * Yes! Finally! Bash built with ncurses support! This fixes the 
annoying problem with lines longer than 80 (?) characters.

svn path=/nixpkgs/trunk/; revision=8248
 2007-03-06 22:46:03 +00:00
Eelco Dolstra
cf693caa08 * Another example of an inline hook. 
svn path=/nixpkgs/trunk/; revision=6864
 2006-10-26 22:30:27 +00:00
Eelco Dolstra
4f03dec496 * Patch for a critical bug in bash. 
svn path=/nixpkgs/trunk/; revision=6848
 2006-10-25 12:38:57 +00:00
Eelco Dolstra
4d3059721d * bash 2.0, findutils 4.2.28. 
* Some Nix expression simplifications.  Sense and simplicity!

svn path=/nixpkgs/trunk/; revision=6836
 2006-10-24 23:05:12 +00:00
Eelco Dolstra
6b03da43d9 * binutils on dietlibc. 
* Pass -lcompat by default in the dietlibc stdenv.

svn path=/nixpkgs/trunk/; revision=6770
 2006-10-19 11:03:20 +00:00
Eelco Dolstra
ce22859f8a * Bash on dietlibc. 
* Pass -D_BSD_SOURCE=1 by default in the dietlibc stdenv.

svn path=/nixpkgs/trunk/; revision=6768
 2006-10-18 16:16:07 +00:00
Eelco Dolstra
ad897a7c96 * Update more URLs. 
svn path=/nixpkgs/trunk/; revision=6713
 2006-10-12 14:53:45 +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
Eelco Dolstra
368c196a62 * More descriptions. 
svn path=/nixpkgs/trunk/; revision=6709
 2006-10-12 10:53:16 +00:00
Armijn Hemel
2018e992be patch the binaries to nuke paths to glibc. Ripped from stdenv/linux/scripts/fix-outpath.sh 
svn path=/nixpkgs/trunk/; revision=6003
 2006-07-31 14:45:53 +00:00
Armijn Hemel
5d9d509ab0 also update static version of bash to 3.1 
svn path=/nixpkgs/trunk/; revision=5523
 2006-06-24 22:09:02 +00:00
Armijn Hemel
722a69f93f update bash to 3.1 
svn path=/nixpkgs/trunk/; revision=4859
 2006-02-19 13:27:56 +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
136c43448d add a static version of bash. This comes in handy for NixOS (installer disk) and the static tools we use to bootstrap Nix on for example NixOS. Can I say NixOS one more time? NixOS. 
svn path=/nixpkgs/trunk/; revision=4423
 2005-12-23 21:43:04 +00:00
Eelco Dolstra
82e678362f * "." -> "source". 
svn path=/nixpkgs/trunk/; revision=4335
 2005-12-05 14:11:09 +00:00
Armijn Hemel
e473e8691c add tcsh 
svn path=/nixpkgs/trunk/; revision=4123
 2005-10-24 15:15:34 +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
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