3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

219 commits

Author SHA1 Message Date
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
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