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
..
bash	Revert "Revert "bash: 4.3-p42 -> 4.3-p46""	2016-08-26 17:08:58 +02:00
bash-completion
dash
elvish
es
fish
fish-foreign-env
grml-zsh-config
mksh
nix-zsh-completions
oh
oh-my-zsh
pash
rc
rssh
rush
tcsh
xonsh
zsh
zsh-completions
zsh-prezto