Commit Graph

86 Commits

Author SHA1 Message Date
hyperfekt
0ffab925ca fish: make python an optional dependency
Python is still used for tests, but does not become part of the closure.

In addition, nowadays fish only ever uses Python via __fish_anypython,
so using sed or propagating python isn't necessary anymore.
2021-05-10 10:18:25 -07:00
Maëlys Bras de fer
c1df7ffb7d fish: fix help for builtins
Removed trailing spaces in `sed` script that made it miss an occurrence of `nroff`.
2021-05-07 22:14:25 -07:00
Cole Helbling
563451277f
fish: 3.2.1 -> 3.2.2
Replacing all occurrences of `/usr` with `/nix` doesn't work, because
one test is just verifying if `wdirname` works (and `dirname /usr/lib`
is not the same as `dirname /nix/lib`).
2021-04-07 11:23:37 -07:00
Cole Helbling
853f1b740c fish: 3.2.0 -> 3.2.1 2021-03-18 09:49:05 -07: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
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
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
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
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
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
Judson
2c9c395a22
fish: use internal wcwidth
Fish 3.0 has an updated an more robust handling of unicode glyphs. Per
the original author of the INTERNAL_WCWIDTH flag, it was something of
misfeature, and they regret that NixOS came to rely on it.

Removes the flag from the Nix expression.

Flag was added originally to Nixpkgs in 68076b7d49

It is being removed entirely from upstream fish:
https://github.com/fish-shell/fish-shell/pull/5777.
2019-07-18 15:00:29 -07:00
qolii
dc84a655b2 fish: 3.0.1 -> 3.0.2 2019-03-02 14:48:33 -08:00
Jethro Kuan
1963f5b70c fish: 3.0.0 -> 3.0.1 2019-02-18 13:12:56 +08:00
Gabriel Ebner
68076b7d49 fish: do not use internal wcwidth
This is important when typing characters such as (U+26A1 HIGH VOLTAGE
SIGN), otherwise fish computes a different character width than the
terminal.  See https://github.com/fish-shell/fish-shell/pull/4816
2018-12-30 10:21:06 +01:00
adisbladis
0ff4d0a516
fish: 2.7.1 -> 3.0.0 2018-12-28 21:23:24 +00:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Will Dietz
d3b59f864a define top-level attrs for getent, getconf
Note that currently getent is explicitly taken from "glibc.bin",
regardless of build configuration which this preserves for now.
(on non-musl anyway)
2018-02-13 11:47:16 -06:00
Will Dietz
172af30d8a fish: on musl use musl-getent 2018-02-13 09:44:35 -06:00
Luke Adams
2dca67864d fish: 2.7.0 -> 2.7.1
Fixes paste bracketing issue with iTerm (macOS)
2017-12-25 14:56:25 -06:00
Orivej Desh
ba3a792435 fish: enable parallel building 2017-11-27 13:34:31 +00:00
adisbladis
ee933bdb1d
fish: 2.6.0 -> 2.7.0 2017-11-27 18:44:52 +08:00
Profpatsch
46eb0e2cd1 fish: add fish_config tests
Checks whether the fish_config script does run.
Cannot check running the web server though (since that requires a port).
2017-08-05 22:31:18 +02:00
Profpatsch
b7290a283a fish: fix the fish_config tool
It requires a python interpreter to work.
2017-08-05 22:14:24 +02:00
Silvan Mosberger
f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
Patrick Callahan
e620135a87 fish: 2.5.0 -> 2.6.0 2017-06-22 21:09:15 -07: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
Patrick Callahan
3f6d21bafc
fish: resolve NixOS-related initialization problems 2017-05-10 10:16:10 +01:00
rnhmjoj
b0f1881440
fish: 2.3.1 -> 2.5.0 2017-02-04 20:58:55 +01:00
Louis Taylor
5ee480bce5 fish: 2.3.0 -> 2.3.1 2016-07-11 05:43:47 +01:00
zimbatm
b482036cbb fish: add shellPath passthru 2016-06-12 18:57:29 +01:00