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