3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

263 commits

Author SHA1 Message Date
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
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
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
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
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