1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Commit graph

171 commits

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