Commit Graph

107 Commits

Author SHA1 Message Date
Jan Tojnar
f21526b5bb
buildFishPlugin: do not pass irrelevant arguments down
mkDerivation does not care about checkPlugins and checkFunctionDirs so let’s avoid polluting the scope.
Also remove installPath argument altogether for the same reason since it is not used at all.
2021-03-13 21:30:37 +01:00
pacien
74a66734cd fishPlugins.fzf-fish: init at 5.6 2021-03-09 14:25:04 +01:00
pacien
d7145807ad fishPlugins.fishtape_3: init at 3.0.1
Keeping fishtape 2.x and 3.x separate because they aren't compatible
with each other and are still both being used to test different packages.
2021-03-09 14:25:04 +01:00
pacien
97b64bd65e fishPlugins.clownfish: init at unstable-2021-01-17 2021-03-09 14:24:59 +01:00
Vincent Haupert
6aa878679a fish: execute fish tests
Still includes `coreutils` in `checkInputs`.

macOS: disables some pexpect tests which depend on pkill/pgrep
(see #103180).
2021-03-06 16:26:22 -08:00
Vincent Haupert
b0c7213bd4 fish: fix passthru test
Patched file now uses double instead of single quotes.
2021-03-06 16:26:22 -08:00
Vincent Haupert
62f9a381a0 fish: 3.1.2 -> 3.2.0
functions/{type.fish,_.fish}: removed, now a builtin

macOS: disable codesigning with CMake flag instead of patching the
CMakeLists.txt.
2021-03-06 16:26:22 -08:00
Dominik Xaver Hörl
cf3e8a7352 fish: avoid nontermination in fhs like setups 2021-02-17 11:31:29 -08:00
pacien
c6efc0b255 wrapFish: fix singleton expansion in shell init
This fixes the expansion of the configuration path in the pathological
case of a singleton, which would otherwise be used verbatim with the
surrounding braces for lookup.

GitHub: see https://github.com/NixOS/nixpkgs/pull/108491#pullrequestreview-590072603
2021-02-16 11:01:43 -08:00
Lily Ballard
c4f980a063 fish: Add fishEnvPreInit option
This new option allows for replacing the sourcing of
/etc/fish/nixos-env-preinit.fish with another file, optionally passing
it through `fenv`. The idea here is that non-NixOS users can do
something like

    fish.override {
      fishEnvPreInit = sourceBash:
        sourceBash "${nix}/etc/profile.d/nix-daemon.sh";
    }

and this will set up their shell environment for Nix just as though they
were running NixOS.
2021-02-04 19:05:22 -08:00
Kevin Griffin
62a50d89cc
babelfish: 1.0.1 -> 1.1.0 2021-02-01 21:25:48 +09:00
Pavol Rusnak
a6ce00c50c
treewide: remove stdenv where not needed 2021-01-25 18:31:47 +01:00
Kevin Griffin
af1df42fec
babelfish: 1.0.0 -> 1.0.1 2021-01-21 22:22:34 +09:00
Cole Helbling
86b83264cb
babelfish: 0.1.3 -> 1.0.0
Notably, adds support for stdout redirections and fixes a failing test.
2021-01-16 07:34:32 -08:00
Sandro
82fd153465
Merge pull request #108946 from kevingriffin/fish-babelfish 2021-01-12 14:27:04 +01:00
Kevin Griffin
8d0ddfc1b6
babelfish: init at version 0.1.3 2021-01-12 20:19:54 +09:00
Michele Guerini Rocco
a306b088f6
Merge pull request #108491 from pacien/fishPlugins-wrapFish
wrapFish: add fish shell wrapper package
2021-01-11 09:10:52 +01:00
pacien
108fd69a8c fishPlugins.buildFishPlugin: rename checkFunctionPath parameter 2021-01-11 03:39:57 +01:00
pacien
648a3db934 fishPlugins.buildFishPlugin: use wrapFish 2021-01-11 00:47:56 +01:00
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
pacien
ae5c662182 wrapFish: add fish shell wrapper package
This adds a wrapper for fish which allows creating shells pre-initialised
with some completions, functions, and configuration scripts from given paths
or from fish plugin packages (`pkgs.fishPlugins.*`).

This is especially handy when one wants to try a plugin in an ephemeral shell.

GitHub: see https://github.com/NixOS/nixpkgs/pull/107834#discussion_r550612519
2021-01-05 17:20:39 +01:00
pacien
d94921db12 fish-foreign-env: move to fishPlugins.foreign-env
And relocate the installed fish functions to the `vendor_functions.d` so
that they're automatically loaded.
2021-01-04 18:53:59 +01:00
pacien
59c1b6d0e7 fishPlugins.pure: init at 3.4.2 2021-01-04 18:51:11 +01:00
pacien
3a987feae1 fishPlugins.fishtape: init at 2.1.3 2021-01-04 18:51:11 +01:00
pacien
c083b27791 fishPlugins: bootstrap fish plugin scope 2021-01-04 18:51:11 +01:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Ollie Charles
1675b11cd4 Remove myself from maintainers sets
Unfortunately I can't reliably commit time to nixpkgs, so I would like to remove myself from being a formal maintainer for these packages.
2020-12-07 14:30:37 +00:00
Graham Christensen
bc49a0815a
utillinux: rename to util-linux 2020-11-24 12:42:06 -05:00
Dominik Xaver Hörl
b45a76916e fish: fixup awk references 2020-07-06 11:09:45 +02:00
Michele Guerini Rocco
b2532174e0
Merge pull request #90670 from bouk/fish-no-tr
fish: replace use of tr with string split
2020-06-18 09:48:01 +02:00
Bouke van der Bijl
84e25cf478 fish: use -p to prepend profile directories 2020-06-17 18:59:56 +02:00
Bouke van der Bijl
9daa1838d3 fish: replace use of tr with string split
This shaves about 4ms off fish start time.

Before (profiled with 'fish --profile prof.txt -c fish_prompt'):

225	4636	----> set -l __nix_profile_paths (echo $NIX_PROFILES | /nix/store/m5ajgnzp2512na31brwfmydwk3l1gawb-coreutils-8.31/bin/tr ' ' '\n')[-1..1]
4411	4411	-----> echo $NIX_PROFILES | /nix/store/m5ajgnzp2512na31brwfmydwk3l1gawb-coreutils-8.31/bin/tr ' ' '\n'

After:

190	248	----> set -l __nix_profile_paths (string split ' ' $NIX_PROFILES)[-1..1]
2020-06-17 18:59:35 +02:00
Cole Helbling
09fd67354e
fish: install docs to $out/share/doc/fish
Otherwise, it ended up going to $out/share/doc, which would pollute this
shared directory, as well as clash with other similarly misbehaving
packages.
2020-06-15 09:20:49 -07:00
Cole Helbling
a17630204a fish: fix and enable fishConfig test
`nix-build -A fish.tests.fishConfig` will now test that the
`fish_config` tool would start up properly. Previously, this test was
effectively disabled due to `withTests` being stubbed out.

I don't think this test ever truly worked, because the generated
temporary file would be cleaned up automatically (or maybe this
"automatically" changed between versions). The solution to this is to
add `delete=False` to the `NamedTemporaryFile` function call, to keep
the temporary file around in order to grep its contents for the expected
output.
2020-05-04 21:31:59 +02:00
Cole Helbling
7a15b6037b
fish: 3.1.1 -> 3.1.2
https://github.com/fish-shell/fish-shell/compare/3.1.1...3.1.2

"This release of fish fixes a major issue discovered in fish 3.1.1:
Commands such as `fzf` and `enhancd`, when used with `eval`, would hang.
`eval` buffered output too aggressively, which has been fixed."
2020-04-28 21:26:50 -07:00
adisbladis
f0fbce6673
Merge pull request #86136 from cole-h/fish
fish: 3.1.0 -> 3.1.1
2020-04-28 14:34:01 +02:00
adisbladis
7686c2cc6a
fish: Patch __fish_anypython function to return build input python3 2020-04-28 11:53:44 +01:00
Cole Helbling
87b02f74cf
fish: disable codesigning
We don't have access to the codesign binary.
2020-04-27 14:23:08 -07:00
Cole Helbling
a43ae05369
fish: 3.1.0 -> 3.1.1
https://github.com/fish-shell/fish-shell/compare/3.1.0...3.1.1

The patch we had to use for Apple SDKs was merged upstream, so it can be
dropped. I ran nixpkgs-fmt, and removed the `with stdenv.lib;` scope
expander.

Additionally, did a little bit of cleanup. I plan on refactoring this
more down the line, but this'll do for now.

I finally figured out why we use `fetchurl` for the tagged release: the
published release tarballs contain a version file, which the
`build_tools/git_version_gen.sh` script reads (and uses as the version
if it exists). The other thing it contains are pre-generated docs for
various `fish` builtins. I've expanded the comment to document this so
nobody is as confused as I was when I first saw it. (Though I plan to
change this and add sphinx as a native build input in order to build the
docs ourselves.)
2020-04-27 09:51:09 -07:00
Emery Hemingway
2ad4e21249 fish: declare tests from nixosTests 2020-04-22 11:45:04 +05:30
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Georges Dubus
af8d7003cf
Merge pull request #79941 from cole-h/fish
fish: 3.0.2 -> 3.1.0
2020-02-18 10:14:48 +01:00
Cole Helbling
2721f9d549
fish-foreign-env: update stderr redirection in patch
Caret stderr redirection has been deprecated and will be removed in a
future version.
2020-02-16 23:29:02 -08:00
Cole Helbling
be2ceb2efc
fish: 3.0.2 -> 3.1.0
fish-shell 3.1.0 was just released today with many niceties (including
the ability to have bash-like temporary env vars e.g. `VAR="var1"
command` instead of needing to use `env VAR="var1" command`). To see the
full list of changes, please visit
https://github.com/fish-shell/fish-shell/releases/tag/3.1.0.
2020-02-14 15:07:22 -08:00
Cole Helbling
98a2276637
fish-foreign-env: git-20170324 -> git-20200209
"`^` as a redirection deprecated and will be removed in the future."
(see the changelog, under the 3.0b1 release)

The latest fish beta release (3.1b1 as of time of writing) errors when
encountering `^&1` (though the fact it is now an error has yet to be
documented by them). The plugin was updated last year to account for
this change, and with the "imminent" release of fish-shell v3.1, this
should be fixed.
2020-02-09 19:01:14 -08:00
Gabriel Ebner
26afc6c46d fish: fix systemctl completion 2020-01-17 17:42:33 +01:00
Jan Tojnar
7ba42794a8
Revert "fish: switch to fetchFromGitHub"
This reverts commit cc997f28d1.

I confused the URLs. The files have the same contents but the former URL is recommended by upstream.
2019-10-20 01:53:10 +02:00
Jan Tojnar
cc997f28d1
fish: switch to fetchFromGitHub
The expression claimed there are differences between the release tarball and the tarball github packages from the tag but fetchFromGitHub literally downloads the same tarball.
2019-10-19 14:30:25 +02:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00