JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
178,316 Commits 2 Branches 0 Tags 13 GiB
d0cc03e8a3
Commit Graph

713 Commits

Author SHA1 Message Date
Tuomas Tynkkynen
1ff422aa23 treewide: Add man & info outputs where necessary (instead of doc) 
Because man & info pages won't be going to $doc after the next commit.
Scripted change for the files having one-package-per-file.
 2017-08-11 21:32:54 +03:00
Linus Heckemann
434d3700d3 oil: init at 0.0.0 2017-08-06 18:17:00 +01:00
Roman Volosatovs
2700b62168 grml-zsh-config: 0.12.4 -> 0.14.2 (#27961) 
* grml-zsh-config: 0.12.4 -> 0.14.2

* grml-zsh-config: fix typo
 2017-08-06 14:58:38 +01:00
Profpatsch
46eb0e2cd1 fish: add fish_config tests 
Checks whether the fish_config script does run.
Cannot check running the web server though (since that requires a port).
 2017-08-05 22:31:18 +02:00
Profpatsch
b7290a283a fish: fix the fish_config tool 
It requires a python interpreter to work.
 2017-08-05 22:14:24 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809) 
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
 2017-08-01 22:03:30 +02:00
Franz Pletz
8a08ee81ab
zsh-completions: 0.25.0 -> 0.26.0 2017-08-01 08:36:34 +02:00
Robert Helgesson
d00e53dc1a
bash-completion: 2.5 -> 2.7 2017-07-19 23:58:53 +02:00
Joachim Fasting
b9e404def4
dash: 0.5.8 -> 0.5.9.1 
Contains mostly fixes as far as I can tell.
 2017-07-13 23:03:40 +02:00
Ole Jørgen Brønner
22aebcf1e1 nix-zsh-completions: add missing version to derivation name 2017-07-10 07:03:07 +02:00
Ole Jørgen Brønner
6ab8d34989 nix-zsh-completions: 0.3 -> 0.3.1 2017-07-10 07:03:07 +02:00
dywedir
3483c09f59 ion: init at 1.0.3 2017-07-09 03:23:53 +03:00
rnhmjoj
cca61e0371
fish-foreign-env: hide warnings when setting PATH 2017-07-08 04:27:18 +02:00
Jörg Thalheim
c7739191da Merge pull request #27158 from tjikini/elvish 
elvish: 0.5 -> 0.9
 2017-07-07 09:52:18 +01:00
Jörg Thalheim
9728c26d28 elvish: remove unnecessary deps.nix 
fully vendorized now
 2017-07-07 09:50:05 +01:00
Maximilian Bosch
bcdfbad836
lambda-mod-zsh-theme: 2017-05-21 -> 2017-07-05 2017-07-06 07:04:13 +02:00
tjikini
eca3e8cc4b elvish: 0.5 -> 0.9 2017-07-05 23:37:11 +03:00
Vladimír Čunát
d1a89ae9d7
Merge branch 'master' into staging 2017-07-03 09:48:58 +02:00
Tim Steinbach
36f52e5ea0
oh-my-zsh: 2017-05-03 -> 2017-06-22 2017-06-30 13:56:31 -04:00
David McFarland
af165175da bash: fix cygwin build 2017-06-26 09:33:03 -03:00
Jörg Thalheim
8810a69adb Merge pull request #26778 from therealpxc/fish 
fish: 2.5.0 -> 2.6.0
 2017-06-24 12:00:20 +01:00
Patrick Callahan
e620135a87 fish: 2.5.0 -> 2.6.0 2017-06-22 21:09:15 -07:00
John Ericson
f75ad79375 bash: Modernize derivation, hopefully fixing cross compilation 2017-06-22 17:53:53 -04:00
Will Dietz
7eaa7adf4e rssh: don't set special bits 2017-06-16 07:31:21 -05:00
Robin Gloster
39e6ad6799
zsh-syntax-highlighting: 0.4.1 -> 0.5.0 2017-05-23 12:18:05 +02:00
Robin Gloster
d50c716162
zsh-completions: 0.18.0 -> 0.25.0 2017-05-23 12:18:05 +02:00
Robin Gloster
ca2f31a56c
zsh-autosuggestions: 0.3.3 -> 0.4.0 2017-05-23 12:18:05 +02:00
Jörg Thalheim
7e40287d00 Merge pull request #25835 from therealpxc/fish 
Fish: source NixOS environment on non-login shells + source shell init on NixOS even when parent shell has done so
 2017-05-22 07:08:30 +01:00
Maximilian Bosch
de8a30b9e7
lambda-mod-zsh-theme: 2017-04-05 -> 2017-05-21 2017-05-21 14:14:34 +02:00
Patrick Callahan
3f91e0dbae fish: source NixOS environment on non-login shells, when it hasn't been 
sourced
(this fixes issue #25789:
https://github.com/NixOS/nixpkgs/issues/25789#issuecomment-301577290 and
the issue with git-annex mentioned here
https://github.com/NixOS/nixpkgs/pull/24314#issuecomment-301587124 )
 2017-05-19 21:00:24 -07:00
Tim Steinbach
4bca428d87
oh-my-zsh: 2017-03-30 -> 2017-05-03 2017-05-16 20:45:02 -04:00
Patrick Callahan
3f6d21bafc
fish: resolve NixOS-related initialization problems 2017-05-10 10:16:10 +01:00
Patrick Callahan
0054865f7e
fish-foreign-env: git-20151223 -> git-20170324 2017-05-10 10:15:51 +01:00
Jörg Thalheim
f4dd7f9a3b Merge pull request #25515 from league/zsh-git-prompt 
zsh-git-prompt: Init at 0.5
 2017-05-09 08:54:41 +01:00
Christopher League
7c185d4af9 zsh-git-prompt: Init at 0.5 
This is a plugin of sorts for your `.zshrc` that can add status
information about the current git repository to your prompt. By
default it uses a python script and is thus easy on the dependencies
and not really worth packaging. But there's also a Haskell
implementation. I set it up sometime back, but then it died when the
libgmp version it was compiled with disappeared in a garbage
collection. So I decided that the Haskell version of zsh-git-prompt
might be worth packaging after all.
 2017-05-07 21:09:15 -04:00
Jörg Thalheim
aad7c7ce88
lambda-mod-zsh-theme: add unstable infix 2017-05-07 07:57:50 +01:00
Maximilian Bosch
1401b13206
lambda-mod-zsh-theme: 2015-12-15 -> 2017-04-05 
fixes #25492
 2017-05-07 07:55:15 +01:00
Tuomas Tynkkynen
7194179854 bash: Remove unnecessary 'Makefile.inc' that is keeping reference to bootstrap-tools 
The file is an example makefile for developing bash plugins, and
contains stuff like:

````
example:	example.o
	$(SHOBJ_LD) $(SHOBJ_LDFLAGS) $(SHOBJ_XLDFLAGS) -o $@ example.o $(SHOBJ_LIBS)
````

So no package is really going to depend on that, and it's making the
.dev output keep a reference to the bootstrap tools. Just nuke it.
 2017-04-26 13:19:51 +03:00
DrawnWren
176ca2aac8 oh-my-zsh: changed example command 
Fixed a typo in the example command. oh-my-zsh-git -> oh-my-zsh
 2017-04-23 23:59:41 +00:00
Joachim Fasting
2993d37ebc
mksh: 52c -> 55 2017-04-23 11:01:02 +02:00
Joachim Fasting
eddf3fa309
mksh: simplify expression somewhat 
Also add myself to maintainers.
 2017-04-23 11:00:57 +02:00
Benno Fünfstück
1db5cf49d3 Merge pull request #24479 from Ma27/init/lambda-mod-zsh-theme 
lambda-mod-zsh-theme: init at eceee68cf46bba9f7f42887c2128b48e8861e31b
 2017-04-22 00:10:14 +02:00
Peter Simons
4e307b644a Merge pull request #24760 from matthewbauer/linux-only-pkgs 
Mark linux-only pkgs
 2017-04-09 14:18:10 +02:00
Maximilian Bosch
3260d8cd70
lambda-mod-zsh-theme: refactor install behavior to use themes dir 
Now it's possible to set the path of this derivation as `ZSH_CUSTOM` in
the zsh configuration, so it's possible to use the theme directly from
the store path.

see https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-and-adding-themes
 2017-04-09 13:51:16 +02:00
Maximilian Bosch
cd56c3334e
lambda-mod-zsh-theme: fix broken maintainers expression 2017-04-09 13:50:18 +02:00
Maximilian Bosch
ea5ff16bb0
lambda-mod-zsh-theme: refactor to use fetchFromGitHub for source retrieval 2017-04-09 13:50:18 +02:00
Maximilian Bosch
74c14f8b28
lambda-mod-zsh-theme: remove unnecessary rec declaration 2017-04-09 13:50:17 +02:00
Maximilian Bosch
2380e96327
lambda-mod-zsh-theme: init at eceee68cf46bba9f7f42887c2128b48e8861e31b 2017-04-09 13:50:17 +02:00
Matthew Bauer
4db3b90314
rssh: make linux-only 2017-04-08 23:34:53 -05:00
Tim Steinbach
e872abe872
oh-my-zsh: 2017-02-27 -> 2017-03-30 2017-03-31 09:22:00 -04:00
Eelco Dolstra
48bc3cf9f4
bash: 4.4p5 -> 4.4p12 2017-03-20 16:47:13 +01:00
Tim Steinbach
e54104ab11 Merge pull request #23875 from NeQuissimus/oh-my-zsh_2017-02-27 
oh-my-zsh: 2017-02-20 -> 2017-02-27
 2017-03-13 20:07:59 -04:00
Tim Steinbach
435b8ed1fc
oh-my-zsh: 2017-02-20 -> 2017-02-27 2017-03-13 20:07:14 -04:00
Tuomas Tynkkynen
dff0ba38a2 bash: Set bash_cv_getcwd_malloc=yes when cross compiling 
Because if you don't, the configure script assumes that your getcwd()
function is broken. Which then makes bash use it's own getcwd()
implementation, which doesn't work if the path to the current directory
contains bind mounts in its paths. This shows up as:

shell-init: error retrieving current directory: getcwd: cannot access parent directories: Bad file descriptor

... and fails the aarch64 glibc build with sandboxes enabled.

Sigh.
 2017-03-14 00:33:29 +02:00
Tim Steinbach
61666724a6
oh-my-zsh: 2017-01-15 -> 2017-02-20 2017-02-21 19:07:59 -05:00
Rahul Gopinath
7901a7a65f dgsh-unstable: Init at 2017-02-05 (#22657) 
Dgsh is the directed graph shell
 2017-02-18 14:25:49 +01:00
Rahul Gopinath
939c846ae7
elvish: 0.1 -> 0.5 2017-02-12 21:37:53 +01:00
Nick Novitski
9c4653cf46 bash-completion: call readlink without errors on Darwin 2017-02-11 09:42:12 +13:00
Robert Helgesson
04bd77fa47
bash-completion: 2.4 -> 2.5 2017-02-06 21:59:10 +01:00
rnhmjoj
b0f1881440
fish: 2.3.1 -> 2.5.0 2017-02-04 20:58:55 +01:00
Thomas Tuegel
a2e1aecc0c
es: add ttuegel to maintainers 2017-01-31 07:54:36 -06:00
Thomas Tuegel
ace284ee95
es: git-2015-04-11 -> 0.9.1 2017-01-31 07:54:02 -06:00
Franz Pletz
e2b14abbe0
tcsh: 6.19.00 -> 6.20.00 2017-01-26 03:52:49 +01:00
Tim Steinbach
9988dae489
oh-my-zsh: 2016-12-16 -> 2017-01-15 2017-01-17 17:55:40 -05:00
Krzysztof Janosz
381aaebe3e
oh-my-zsh: add share dir to pathsToLink 2017-01-17 21:35:56 +01:00
Yacine Hmito
f88e2fb5f1 zsh-autosuggestions: init at 0.3.3 (#21792) 
Added a related `programs.zsh.enableAutosuggestions` option
 2017-01-11 07:00:48 +01:00
Vladimír Čunát
f803270b7e
bash: switch the default 4.3 -> 4.4 
... and remove the now-unused 4.3 expression.
 2017-01-05 01:07:36 +01:00
Vladimír Čunát
57fc4d21b7
bash-4.4: p0 -> p5 + a security patch from Gentoo 2017-01-05 01:01:02 +01:00
Vladimír Čunát
22796f0d4f
bash-4.3: fix security problems via a Gentoo patch 2017-01-05 00:00:24 +01:00
Daiderd Jordan
f04783876c
bash-4.3-p46 -> bash-4.3-p48 2017-01-04 22:37:07 +01:00
Pascal Wittmann
2cfe735d1a
zsh: 5.3 -> 5.3.1 2016-12-21 21:21:59 +01:00
Ole Jørgen Brønner
52a220aaa0 nix-zsh-completions: 0.2 -> 0.3 2016-12-21 11:59:14 +01:00
Tim Steinbach
3cf9b58003
oh-my-zsh: 2016-11-16 -> 2016-12-14 2016-12-17 15:32:48 -05:00
Tim Steinbach
788417e607
zsh: 5.2 -> 5.3 2016-12-12 17:48:18 -05:00
Marius Bergmann
d2523a4f3d rssh: Make rssh a valid shell 
The rssh package did not have the 'shellPath' attribute, so it could not
be used as the default shell for a nixos user. I fixed this by adding
the attribute.
 2016-12-01 14:48:47 +01:00
Tim Steinbach
91677169ab
oh-my-zsh: 2016-11-03 -> 2016-11-16 2016-11-19 20:57:54 -05:00
Vladimír Čunát
8b565d6478
Merge #20081: update alsa lib, plugins and utils 2016-11-17 11:26:00 +01:00
Lancelot SIX
39297fa36b rush: 1.7 -> 1.8 (#20424) 2016-11-15 13:33:56 +00:00
Tim Steinbach
6a7e6cdd66
oh-my-zsh: 2016-10-25 -> 2016-11-03 2016-11-09 19:57:32 -05:00
Tim Steinbach
4c9d8538dd
oh-my-zsh: 2016-10-08 -> 2016-10-25 2016-10-25 14:29:36 -04:00
Tim Steinbach
276086c540
oh-my-zsh: 2016-09-24 -> 2016-10-08 2016-10-08 18:32:37 -04:00
Graham Christensen
822d484b68 oh-my-zsh: Fix oh-my-zsh's loading of ~/.oh-my-zsh 2016-10-07 17:18:17 -04:00
Thomas Tuegel
2e255a2edd
Merge branch 'staging' 2016-10-06 09:51:02 -05:00
Jörg Thalheim
2d84b44918 Merge pull request #19259 from periklis/topic_zsh-syntax-highlighting 
zsh-syntax-highlighting: enable build for darwin
 2016-10-06 09:58:02 +02:00
Vladimír Čunát
30f551d8b2 Merge branch 'master' into staging 2016-10-05 19:02:48 +02:00
Periklis Tsirakidis
c55937fab4 zsh-syntax-highlighting: enable build for darwin 2016-10-05 16:43:53 +02:00
Markus Hauck
aafbd40577 Replace hard coded /bin/bash occurrences 2016-10-04 20:15:37 +02:00
Jörg Thalheim
888f6a1280 Merge pull request #19199 from wizeman/u/fix-help2man-hash 
help2man: fix hash
 2016-10-03 19:26:44 +02:00
Ignat Loskutov
9f34b5595e
zsh-syntax-highlighting: init at 0.4.1 
fixes #19179
 2016-10-03 17:49:04 +02:00
Eelco Dolstra
518340624d Merge remote-tracking branch 'origin/master' into staging 2016-09-29 13:06:14 +02:00
Robert Helgesson
dbe350f5d0
bash-completion: 2.1 -> 2.4 2016-09-28 17:45:45 +02:00
Vladimír Čunát
77604964b6 Merge branch 'master' into staging 2016-09-28 17:13:59 +02:00
Tim Steinbach
e10d6cad6d
oh-my-zsh: 2016-08-01 -> 2016-09-24 2016-09-27 08:19:25 -04:00
Vladimír Čunát
f37566d396 bash 4.4: split headers into .dev 2016-09-17 10:51:32 +02:00
Vladimír Čunát
40a6918af3 bash: bring back 4.3 for the non-interactive version 
... until someone looks better at the outputs. The size has grown in 4.4,
and it seems like installing binary plugins, headers, etc.
 2016-09-17 10:49:28 +02:00
Vladimír Čunát
bbadb1da2a readline70: init at 7.0p0 
Also switch bash-4.4 to it, as it's unable to link with older readline
versions (only bashInteractive is affected).
 2016-09-17 01:16:24 +02:00
Vladimír Čunát
02163da708 bash: fixup the patch-list paths 2016-09-17 00:43:13 +02:00
Matthias Beyer
3689be00d8 Add bash-4.4-patches.nix 2016-09-16 22:06:55 +02:00
Matthias Beyer
4a674282e5 bash: 4.3 -> 4.4 2016-09-16 22:05:18 +02:00
Kamil Chmielewski
914e0e594c buildGoPackage: deps.json -> deps.nix in NIXON 
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541

* update docs to describe `deps.nix`
* include goDeps in nix-shell GOPATH
* NixOS 16.09 rel notes about replacing goPackages
 2016-09-16 00:04:55 +01:00
obadz
3de6e5be50 Merge branch 'master' into staging 
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
 2016-08-27 23:54:54 +01:00
Joachim F
c30792ed43 Merge pull request #17947 from RamKromberg/init/rc 
rc: init at 1.7.4
 2016-08-26 18:34:32 +02:00
Franz Pletz
098680e78e
Revert "Revert "bash: 4.3-p42 -> 4.3-p46"" 
This reverts commit 36e75a2285.

Sorry, had bash reverted temporarily to test the build of the
sqlite bump and forgot to remove that commit.
 2016-08-26 17:08:58 +02:00
Franz Pletz
36e75a2285
Revert "bash: 4.3-p42 -> 4.3-p46" 
This reverts commit e39a3237e6.
 2016-08-26 17:06:45 +02:00
Eelco Dolstra
e39a3237e6 bash: 4.3-p42 -> 4.3-p46 2016-08-26 16:36:07 +02:00
Ram Kromberg
4c72c81e08 rc: init at 1.7.4 2016-08-26 16:24:43 +03:00
Michael Raskin
693be25cc3 tcsh: take patch from Debian and edit it to fix handling of glibc-2.24 union wait removal 2016-08-26 14:59:39 +02:00
Franz Pletz
bd4490e277 Merge branch 'master' into hardened-stdenv 2016-08-13 16:59:55 +02:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Kamil Chmielewski
da3ddd48e4 buildGoPackage: remove Go deps file libs.json 
After #16017 there were a lot
of comments saying that `nix` would be better than `JSON`
for Go packages dependency sets.
As said in https://github.com/NixOS/nixpkgs/pull/16017#issuecomment-229624046

    > Because of the content-addressable store, if two programs have the
    > same dependency it will already result in the same derivation in
    > the
    > store. Git also has compression in the pack files so it won't make
    > much difference to duplicate the dependencies on disk. And finally
    > most users will just use the binary builds so it won't make any
    > differences to them.

This PR removes `libs.json` file and puts all package dependencies in
theirs `deps.json`.
 2016-08-11 23:07:09 +02:00
Tim Steinbach
43fd03a6df oh-my-zsh: 2016-07-15 -> 2016-08-01 2016-08-05 09:53:48 -04:00
Robin Gloster
1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen
16d48b8280 Re-enable bunch of packages on Darwin 
Prior to 1bf5ded193 these contained
`hydraPlatforms = platforms.linux`, which was apparently misleading.
 2016-08-03 00:55:42 +03:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms 
Build-tested on x86_64 Linux & Mac.
 2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms 
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
 2016-08-02 21:17:44 +03:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Rahul Gopinath
fbf85ce15a pash: 2015-11-06 -> 2016-07-06 2016-07-28 17:16:37 -07:00
Robin Gloster
1f04b4a566 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-21 00:56:43 +00:00
Rok Garbas
d9871f52b4 xonsh: 0.4.1 -> 0.4.3 2016-07-21 01:01:57 +02:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Tim Steinbach
1e510fd87c oh-my-zsh: 2016-07-05 -> 2016-07-15 2016-07-18 10:55:02 -04:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Tim Steinbach
71ad2ed226 oh-my-zsh: 2016-06-18 -> 2016-07-05 (#16874) 2016-07-12 09:55:17 +02:00
Louis Taylor
5ee480bce5 fish: 2.3.0 -> 2.3.1 2016-07-11 05:43:47 +01:00
Joachim Fasting
3ac882ad44 Merge pull request #16589 from vrthra/elvish 
elvish: disable darwin
 2016-07-02 15:35:49 +02:00
Rahul Gopinath
8c7a32a670 elvish: disable darwin 2016-06-28 21:13:33 -07:00
Ole Jørgen Brønner
08f0ce1d0a zsh-completions: init at version 0.18.0 (#16512) 
"This projects aims at gathering/developing new completion scripts that
are not available in Zsh yet. The scripts are meant to be contributed to
the Zsh project when stable enough."
 2016-06-27 00:39:18 +02:00
Rahul Gopinath
ae3d492924 xonsh: Add XONSH_INTERACTIVE and remove replay test 2016-06-25 17:50:27 -07:00
Rahul Gopinath
f3fc9f1eb0 xonsh: 0.3.4 -> 0.4.1 
* Disable windows tests that get erroneously executed
 2016-06-25 09:27:18 -07:00
Arseniy Seroka
045cd10e77 Merge pull request #16329 from vrthra/elvish 
elvish: init at 0.1
 2016-06-25 13:40:47 +03:00
Michael Raskin
b3bcb59bd5 tcsh: import an Arch patch (merging the two patches into a single one) for fixing gcc5 optimisation 2016-06-23 11:01:21 +02:00
Michael Raskin
b300a8937e Merge pull request #14583 from AndersonTorres/tcsh 
tcsh: 6.18.01 -> 6.19.00
 2016-06-23 08:47:20 +00:00
Rahul Gopinath
293d23abb4 elvish: init at 0.1 
A novel unix shell written in go language.
 2016-06-21 00:04:54 -07:00
Ricardo Ardissone
b81f3e4682 pythonPackages.prompt_toolkit: move pygments to propagatedBuildInputs 2016-06-20 13:41:05 +02:00
Ricardo Ardissone
5d80a0244b xonsh: 0.3.2 -> 0.3.4 2016-06-20 13:41:05 +02:00
Joachim Fasting
b3832e6288 Merge pull request #16339 from NeQuissimus/ohmyzsh20160618 
oh-my-zsh: 2016-04-20 -> 2016-06-18
 2016-06-20 03:54:10 +02:00
Tim Steinbach
b2faec8adc oh-my-zsh: 2016-04-20 -> 2016-06-18 2016-06-19 14:19:23 +00:00
zimbatm
7e578dc334 zsh: add shellPath passthru 2016-06-12 18:57:31 +01:00
zimbatm
a9f42f633b xonsh: add shellPath passthru 2016-06-12 18:57:31 +01:00
zimbatm
53060e5bb8 tcsh: add shellPath passthru 2016-06-12 18:57:31 +01:00
zimbatm
2e22de1f58 rush: add shellPath passthru 2016-06-12 18:57:30 +01:00
zimbatm
27ef2eb695 pash: add shellPath passthru 2016-06-12 18:57:30 +01:00
zimbatm
7fcd50da4f mksh: add shellPath passthru 2016-06-12 18:57:30 +01:00
zimbatm
b482036cbb fish: add shellPath passthru 2016-06-12 18:57:29 +01:00
zimbatm
68865f51ef es: add shellPath passthru 2016-06-12 18:57:29 +01:00
zimbatm
b5dad466d5 dash: add shellPath passthru 2016-06-12 18:57:29 +01:00
Kjetil Orbekk
3d7c8bd179 fish: fix completion from NIX_PROFILES 
Load NIX_PROFILES at shell startup, not at build time.
This one was missed in #16039.
 2016-06-12 01:16:35 -04:00
Robin Gloster
8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Kamil Chmielewski
7eb671ebcd no more goPackages 2016-06-09 13:08:00 +02:00
Kamil Chmielewski
c7bf8afbfc oh: extracted from goPackages 2016-06-09 11:21:30 +02:00
Kjetil Orbekk
027ca71156 fish: fix completions 
Completion was broken because some variables were resolved at
installation time instead of being added to the script.

Closes #16039.
 2016-06-07 14:38:54 +02:00
Rok Garbas
66c73b3f36 xonsh: 0.2.7 -> 0.3.2 
* pythonPackages.prompt_toolkit make it build for py35
 2016-06-04 18:05:12 +02:00
Tuomas Tynkkynen
bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
rnhmjoj
17ec9368cd
fish: 2.2.0 -> 2.3.0 2016-05-26 00:10:22 +02:00
Vladimír Čunát
3472b61f37 fish: use a different alias man_db -> man-db 2016-05-24 10:07:29 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Rok Garbas
76222c10d5 zsh-prezto: update to latest and fetch submodules 2016-05-17 01:56:35 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Alexei Robyn
0cebbc92f0 rssh: init at 2.3.4 2016-05-16 12:02:14 +10:00
Rok Garbas
770017d610 zsh-prezto: init at revision 7227c4f0b 2016-05-15 05:05:05 +02:00
Vladimír Čunát
6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Ricardo Ardissone
5009d53d9a xonsh: 0.1.3 -> 0.2.7 2016-05-11 13:19:58 -03:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
 2016-05-03 23:12:48 +03:00
Robin Gloster
c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00:00
Tim Steinbach
e05ef5f94b oh-my-zsh: 2016-04-06 -> 2016-04-20 2016-04-30 01:43:31 +00:00
Tuomas Tynkkynen
4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Eric Seidel
7e92ae903e fish: only use kbd on linux 2016-04-25 09:13:06 -07:00
Vladimír Čunát
c7377b0e4a zlib, bash: mass-rebuild cleanup 2016-04-25 17:12:49 +02:00
Tuomas Tynkkynen
cfdef68ad2 fish: Reference correct output of glibc 2016-04-18 21:32:43 +03:00
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
AndersonTorres
974cbde58e tcsh: 6.18.01 -> 6.19.00 2016-04-10 20:40:26 -03:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
 2016-04-10 11:17:52 +02:00
Tuomas Tynkkynen
03c6434756 Merge pull request #14526 from Profpatsch/fish-completions 
fish: pick up completion files from other packages
 2016-04-09 20:08:46 +03:00
Profpatsch
a011083cda fish: pick up completion files from other packages 
Some packages bring their own completions in
/share/fish/vendor_completions.d. Now they are picked up by fish from
every path in NIX_PROFILES.
 2016-04-09 00:08:48 +02:00
Robin Gloster
3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00:00
Tim Steinbach
0d8b694a10 oh-my-zsh: 2016-03-31 -> 2016-04-06 2016-04-07 08:33:17 -04:00
Robin Gloster
812e25c86b mksh: disable format hardening 2016-04-06 09:12:20 +00:00
Robin Gloster
696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-03 11:01:57 +00:00
joachifm
e4874acae6 Merge pull request #14343 from mayflower/upstream-zsh-zprofile 
zsh: fix configureFlags #14256
 2016-04-01 14:44:38 +00:00
Tim Steinbach
d9798553c6 oh-my-zsh: 2016-03-24 -> 2016-03-31 2016-04-01 08:09:34 -04:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size 
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
 2016-04-01 10:06:01 +02:00
Christian Albrecht
9c6a69230d zsh: fix configureFlags #14256 
commit 97332d3 introduced non expanding $out/etc/zprofile in zshs compiled in PATH.
this commit reverts the change so that $out is expanded at configure time.
 2016-03-31 16:57:30 +02:00
Robin Gloster
f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00:00
NeQuissimus
83f37b8d10 oh-my-zsh: 2016-03-19 -> 2016-03-24 2016-03-25 15:07:06 -04:00
Tim Steinbach
00db6a67f1 oh-my-zsh: 2016-03-11 -> 2016-03-19 2016-03-22 22:04:39 +00:00
Peter Hoeg
fa0c2c08a2 bash-completion: remove collision 
nmcli is already provided by network-manager
 2016-03-20 22:18:53 +08:00
Tim Steinbach
344f9672d0 oh-my-zsh: 2016-02-27 -> 2016-03-11 2016-03-15 10:34:10 -04:00
Robin Gloster
3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00:00
Christoph Hrdinka
c4ee8f5700 zsh: fix zsh.info* install location 2016-03-09 14:13:31 +01:00
Thomas Tuegel
da972b6cc4 ncurses: move runtime utilities to $out 
All the programs provided by ncurses were being installed to the $dev
output, but several of them are intended for runtime use, e.g. to
operate on the running terminal. These user-facing programs are moved to
the $bin output.

Several packages referred to "${ncurses}/bin" or "${ncurses.dev}/bin" at
runtime; these paths are also updated to refer to "${ncurses.bin}/bin".
 2016-03-08 11:35:24 -06:00
Tobias Geerinckx-Rice
efb76ae10b mksh: 52 -> 52c 
Changes: https://www.mirbsd.org/mksh.htm#clog
 2016-03-08 18:07:00 +01:00
Vladimír Čunát
61ebdc192d bash-interactive: better split doc stuff 
... while avoiding mass rebuild ATM.
 2016-03-08 09:59:24 +01:00
Vladimír Čunát
09af15654f Merge master into closure-size 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
 2016-03-08 09:58:19 +01:00
Franz Pletz
baee91ec60 cc-wrapper: Check if ld supports -z, fixes darwin 2016-03-07 21:40:20 +01:00
Sergiu Ivanov
7a31227573 oh-my-zsh-git: init at 2016-02-27 2016-03-07 19:42:26 +01:00
Franz Pletz
aff1f4ab94 Use general hardening flag toggle lists 
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
 2016-03-05 18:55:26 +01:00
Robin Gloster
d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00:00
zimbatm
57f7ff00fe Merge pull request #13368 from nathan7/fish-ul 
fish: fix hidden dependency on ul(1) on Linux
 2016-02-28 22:09:32 +00:00
Nathan Zadoks
010271d47a fish: fix hidden dependency on ${glibc}/bin/getent on Linux 2016-02-28 22:27:53 +01:00
Nathan Zadoks
da1f465b94 fish: fix hidden dependency on utillinux on Linux 2016-02-28 22:27:53 +01:00
Scott Olson
a93a2e2360 fish: remove kbd dependency on Darwin 2016-02-28 14:55:51 -06:00
Robin Gloster
3477e662e6 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-27 00:08:08 +00:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Robin Gloster
9229e9c656 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-07 11:17:57 +00:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size 
Let's get rid of those merge conflicts.
 2016-02-03 16:57:19 +01:00
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