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
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
Vladimír Čunát
8da52a642a
Merge branch 'staging' into v/modular
...
Conflicts (easy):
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
Vladimír Čunát
fb59f27a43
WIP: getting good
2014-08-27 01:14:09 +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