mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
Code Issues Wiki Activity
37623 commits 276 branches 124 tags 6.1 GiB
Commit graph

136 commits

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