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
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