Commit Graph

87 Commits

Author SHA1 Message Date
Artturin
f0e657f3b1 Merge branch 'master' into staging-next 2024-09-25 06:05:01 +03:00
Artturin
e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Fabián Heredia Montiel
b1e9a03960 zsh: add backported gcc_14 patch
Alpine
https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/70300

Buildroot
https://lore.kernel.org/all/20240720230500.26fbd225@windsurf/T/

OpenSUSE
https://build.opensuse.org/projects/home:jamborm:gcc14fixes/packages/zsh/files/zsh-4c89849c98172c951a9def3690e8647dae76308f.patch

OpenWRT
https://github.com/openwrt/packages/pull/24346/files
2024-09-11 01:44:18 -06:00
Randy Eckenrode
d976a67189
zsh: fix compatibility with texinfo 7.1
https://www.zsh.org/mla/workers/2023/msg00591.html
2024-07-05 16:52:59 -04:00
Alexis Hildebrandt
f8c4a98e8e treewide: Remove the definite article from meta.description
nix run nixpkgs#silver-searcher -- -G '\.nix$' -0l 'description.*"([Tt]he)? ' pkgs \
  | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee 's/(description.*")[Tt]he (.)/\1\U\2/'
2024-06-09 23:08:46 +02:00
Minijackson
17d990d9f7
zsh: disable function subdirs
partial revert of #242678,
since it can make Zsh very slow to start
2024-06-07 16:58:34 +02:00
Robert Scott
9b10f9a0c4 zsh: add nixosTests zsh-history & oh-my-zsh to passthru.tests 2023-10-15 05:47:38 +03:00
Randy Eckenrode
0401989eb9
zsh: fix configure script with clang 16
While zsh builds, the resulting zsh is broken on Darwin.
2023-09-04 19:42:32 -04:00
zendo
4f5308922f treewide: add meta.mainProgram
Related PR: https://github.com/NixOS/nixpkgs/pull/246386
2023-08-04 10:00:59 +00:00
Artturin
6984a7201c zsh: enable function subdirs
and patch script shebangs
2023-07-10 18:30:19 +03:00
Artturin
bdcff9cd3c zsh: build pcre.so
77f84f07c4 changed zsh to use pkg-config
and i assumed that because the zsh binary was linked with pcre that pcre
support was working, but it was not.
2023-07-06 01:10:19 +03:00
MaxHearnden
77f84f07c4 zsh: fix cross by using pkg-config to discover libpcre
The configure script calls pcre-config to find pcre however using
nativeBuildInputs for this meant that zsh found the native libraries.

weirdly only pkgsCross.armv7l-hf-multiplatform.zsh was failing and not
pkgsCross.aarch64-multiplatform.zsh
2023-06-23 14:17:23 +03:00
Lin Jian
43f45fe24f
zsh: fix the guard variable for /etc/set-environment
This guard variable is written to $out/etc/zshenv using
here-documents, so we need to escape it.
2023-03-29 13:51:26 +08:00
Lin Jian
8e2e741ab5
zsh: set environment variables in zshenv instead of zprofile
This patch fixes two issues:

1. The file in which environment variables are set is inconsistent.
  - This file sets them in zprofile when programs.zsh.enable is not
  set.
  - Zsh module sets them in zshenv when programs.zsh.enable is set.

2. Setting environment variables in zprofile overrides what users set
in .zshenv.  See these[1] home-manager[2] issues[3].

/etc/profile is also changed to /etc/set-environment. Here is a
comparison:

Using /etc/profile:
- Pros
  - config.environment.shellInit is sourced in all zsh
- Cons
  - config.environment.loginShellInit is also sourced in non-login zsh
  - config.programs.bash.shellInit is also sourced in all zsh
  - config.programs.bash.loginShellInit is also sourced in all zsh

Using /etc/set-environment:
- Pros
  - config.programs.bash.shellInit is not sourced in any zsh
  - config.programs.bash.loginShellInit is not sourced in any zsh
- Cons
  - config.environment.shellInit is not sourced in any zsh
  - config.environment.loginShellInit is not sourced in any zsh

[1]: https://github.com/nix-community/home-manager/issues/2751#issuecomment-1048682643
[2]: https://github.com/nix-community/home-manager/issues/2991
[3]: https://github.com/nix-community/home-manager/issues/3681#issuecomment-1436054233
2023-03-13 17:25:04 +08:00
Artturin
c55b931644 treewide: fix lints and remove a unneeded cmake input 2022-12-09 01:16:08 +02:00
Jörg Thalheim
0114278a9a zsh: fix modules when cross-compiling 2022-12-02 19:46:48 +01:00
Dmitry Bogatov
b8f1cd1e97
zsh: split documentation into separate outputs 2022-06-17 21:10:27 -04:00
Artturin
c8474bca54 zsh: remove versioned binary
fedora, openSUSE, and debian do it too

https://src.fedoraproject.org/rpms/zsh/blob/rawhide/f/zsh.spec#_108
https://salsa.debian.org/debian/zsh/-/blob/debian/debian/rules#L142
2022-05-31 19:56:02 +03:00
Artturin
19dd92369e zsh: 5.8.1 -> 5.9 && add artturin to maintainers 2022-05-26 04:18:43 +03:00
Artturin
ea79263e60 pkgs/shells: enable strictDeps 2022-05-06 22:31:38 +03:00
Alyssa Ross
b0a871a3ec zsh: 5.8 -> 5.8.1
Fixes: CVE-2021-45444
2022-03-14 12:57:03 +00:00
Will Cohen
9b7691cbb4 zsh: exclude util-linux on darwin 2022-01-11 14:00:32 -05:00
Will Cohen
75d64f2c19 zsh: remove superfluous darwin postInstall make 2022-01-10 22:20:16 -05:00
Will Cohen
845f228ff8 zsh: fix build on darwin 2022-01-10 12:57:34 -05:00
Michael Hoang
7ada385af0 zsh: Support building from Git checkouts
A pregenerated `./configure` script is included with `zsh` release
tarballs which makes it so that `zsh` won't build Git checkouts without
`autoreconfHook`.

There are also other files that were pregenerated and included in
releases so a few other tools are necessary to successfully build `zsh`.
We can also build the docs ourselves instead of using the `docs`
tarball.

This means that users can now easily override the `zsh` derivation:

    pkgs.zsh.overrideAttrs (old: {
      src = fetchgit {
        url = "https://git.code.sf.net/p/zsh/code.git";
        rev = "zsh-5.8";
        sha256 = "sha256-Gou2UgafLHnZnG2X8DulidOTO1idTQpnZ3DicZuhCZc=";
      };
    })
2022-01-09 22:56:36 +11:00
Michael Hoang
41c7806df5 zsh: fix git stash drop completions 2021-10-28 13:28:58 +11:00
Guillaume Girol
af9f38c205 zsh: fix TZ= completion 2021-09-03 12:00:00 +00:00
Robert Hensing
0e5cfdb8c5 Partially revert "various: cleanup of 'inherit version;'"
I forgot to unresolve a conversation, causing the PR to be merged
prematurely by someone else.

This partially reverts commit 1e9baed56b.
2021-07-17 22:39:28 +02:00
Felix Buehler
1e9baed56b various: cleanup of 'inherit version;' 2021-07-16 00:17:12 +02:00
Ben Siraphob
e245ae3c3a pkgs/shells: stdenv.lib -> lib 2021-01-15 14:24:03 +07:00
Andreas Fuchs
58fa36d30c zsh: Disable compiling in /usr/local/... as the site fndir
With the default configure flags, zsh compiles in a reference to the
"site function" directory that's outside the store path. Under the
right (wrong) circumstances, other builds using zsh can be affected by
these functions.
2020-11-28 19:04:06 -05:00
Patrick Hilhorst
f7e390e6d4 treewide: fix redirected urls (run 3)
Related:
 - 9fc5e7e473
 - 593e11fd94
 - 508ae42a0f

Since the last time I ran this script, the Repology API changed, so I had to
adapt the script used in the previous PR. The new API should be more robust, so
overall this is a positive (no more grepping the error messages for our relevant
data but just a nice json structure).

Here's the new script I used:

```sh
curl https://repology.org/api/v1/repository/nix_unstable/problems \
   | jq -r '.[] | select(.type == "homepage_permanent_https_redirect") | .data | "s@\(.url)@\(.target)@"' \
   | sort | uniq | tee script.sed
find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```

I will also add this script to `maintainers/scripts`.
2020-10-02 09:01:35 -07:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
zowoq
83f3aa0113 zsh: 5.7.1 -> 5.8
https://www.zsh.org/mla/zsh-announce/141
2020-02-16 10:45:52 +10:00
Izorkin
8f5af404d2 zsh: fix bracketed-paste-magic 2020-01-30 14:02:34 +03:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Jörg Thalheim
84d2202a46
zsh: fix cross-compiling support 2019-08-02 10:04:10 +01:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Florian Friesdorf
fbef5ab82f Remove myself as maintainer from packages
I'm currently not maintaining any packages.
2019-02-22 16:14:13 +01:00
Will Dietz
bcea7dd394 zsh: 5.7 -> 5.7.1 2019-02-03 19:05:19 -06:00
Piotr Halama
40296f7c18 zsh: fix for infinite recursion in VCS_INFO_detect_p4
Fixes following error for grml-zsh users:
VCS_INFO_detect_p4:79: maximum nested function level reached; increase FUNCNEST?
2019-01-28 20:09:36 +01:00
Pascal Wittmann
f826944d77
zsh: 5.6.2 -> 5.7 2019-01-24 21:37:54 +01:00
Sean Haugh
68982ea938 zsh: move --enable-zprofile into configureFlags (#52718) 2019-01-08 11:11:37 +01:00
Maximilian Bosch
e8fb77a944
Merge pull request #46152 from Ma27/fix-setxkbmap-completion
zsh: patch `_setxkbmap` completion script
2018-10-19 14:33:04 +02:00
Maximilian Bosch
18d461533b
zsh: patch _setxkbmap completion script
Instead of searching `/usr` it should search for the `xkb`,
$XDG_DATA_DIRS will be searched. With this approach we allow compliance
on NixOS and non-NixOS systems to find `symbols` in the `xkb` directory.

The patch has been accepted by upstream, but isn't released yet, so this
is mainly a temporary fix until we can bump ZSH to the next stable version.

The `xserver` module links `/share/X11/xkb` to `/run/current-system` to
make this possible.

The fix can be tested inside the following VM:

```
{
  zshtest = {
    programs.zsh.enable = true;
    users.extraUsers.vm = {
      password = "vm";
      isNormalUser = true;
    };
    services.xserver.enable = true;
  };
}
```

Fixes #46025
2018-09-20 12:54:34 +02:00
Will Dietz
ef21db9bd3 zsh: 5.6.1 -> 5.6.2
From upstream's NEWS:

> Changes from 5.6.1 to 5.6.2
> ---------------------------
>
> Fix another SIGTTOU case.
>
> Fix SIGWINCH being ignored when zsh is not in the foreground.
>
> The release tarballs are now compressed using xz(1), whereas previously
> both xz(1) and gzip(1) versions were available.  If this gets in your way,
> give us a shout.
>
2018-09-15 00:05:48 -05:00
Christoph Hrdinka
cc68ac9807
zsh: 5.6 -> 5.6.1
Signed-off-by: Christoph Hrdinka <c.github@hrdinka.at>
2018-09-10 23:19:05 +02:00
Will Dietz
59f5a65e72 zsh: 5.5.1 -> 5.6 (#46052)
Security, see:

https://github.com/zsh-users/zsh/blob/zsh-5.6/NEWS#L7
2018-09-04 23:32:43 +02:00
Tim Steinbach
c69eae9a91
zsh: 5.5 -> 5.5.1 2018-04-17 12:08:38 -04:00
Tor Hedin Brønner
9d53bc38c1 zsh: 5.4.2 -> 5.5 2018-04-09 17:21:07 +02:00