Commit Graph

50 Commits

Author SHA1 Message Date
Stefan Frijters
9a18a5dbad texinfo: enable structuredAttrs (#548605) 2026-08-14 12:07:15 +00:00
Stefan Frijters
48e25ca7b0 texinfo: enable structuredAttrs 2026-08-03 00:55:08 +02:00
Alexis Hildebrandt
cbb6959f31 texinfo: 7.2 -> 7.3 2026-07-19 20:45:04 +02:00
Stig Palmquist
668b0b4e48 texinfoInteractive: add patch for perl 5.42
Add patch for perl 5.42 from Debian that fixes syntax warnings causing test
failures via Texinfo::Convert::Coverter and Texinfo::Convert::LaTeX

The patch is only applied if:

- Versions =< 7.2, since this is fixed in later git releases of texinfo

- interactive = true, since tests are disabled for other cases, and
  applying it for all cases causes a mass rebuild.
2025-11-30 16:47:16 +01:00
Wolfgang Walther
5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Sandro Jäckel
b391ddf579 texinfo6_7: drop 2025-06-09 03:21:00 +02:00
Alyssa Ross
e8a88209a4 texinfoInteractive: refactor XFAIL_TESTS
The previous code had to avoid a mass rebuild.  Clean it up.
2025-04-28 10:54:50 +02:00
Alyssa Ross
84c2e8ed76 texinfoInteractive: fix tests
Fixes: 7cd6e30023 ("texinfo7: 7.1.1 -> 7.2")
2025-04-26 17:22:11 +02:00
Peder Bergebakken Sundt
5aba99242e treewide: fix typos in comments
Made with

```shell
git restore .
fd '\.nix$' pkgs/ --type f -j1 -x bash -xc "$(cat <<"EOF"
    typos --no-check-filenames --write-changes "$1"
    git diff --exit-code "$1" && exit
    #( git diff "$1" | grep -qE "^\+ +[^# ]") && git restore "$1"
    count1="$( bat --language nix --diff --style changes "$1" --theme "Monokai Extended" --color always | aha --no-header | grep -E '^<span style="color:olive;">~</span> ' | wc -l )"
    count2="$( bat --language nix --diff --style changes "$1" --theme "Monokai Extended" --color always | aha --no-header | grep -E '^<span style="color:olive;">~</span> (<span style="color:#f8f8f2;"> *</span>)?<span style="color:#75715e;">.*</span>$' | wc -l )"
    [[ $count1 -ne $count2 ]] && git restore "$1"
EOF
)" -- {}
```

and filtered with `GIT_DIFF_OPTS='--unified=15' git -c interactive.singleKey=true add --patch`

I initially tried using the tree-sitter cli, python bindings and even ast-grep through various means, but this is what I ended up with.
2025-02-24 10:44:41 +01:00
Silvan Mosberger
e3491c9e40 bash: Make interactive the default
The status quo of `bash` not being interactive is frustrating for many users,
because trying to use it interactively is just messed up, and
`bashInteractive` is not intuitive and barely discoverable.

This was brought to my (and many others) attention by @stahnma in his
[talk at CfgMgmtCamp 2025](https://cfp.cfgmgmtcamp.org/ghent2025/talk/YUVUTN/),
where he highlighted this as one of the frustrations he ran into when
learning Nix.

Why this is fine:
- No reason for not making interactive the default was given in the original commit (6c6ff6f36f), but probably it was due to the increase in closure size
- The closure size only increases by 6.9MiB (19.5%) today, with the
  added dependency on the store paths for readline and ncurses, which
  are needed on systems in almost all cases anyways
- If somebody really needs to get a more minimal system, they can use
  the newly-introduced `bashNonInteractive` instead now
- Though to apply it consistently, they'll need to do that in an
  overlay like
  ```
  final: prev: {
    bash = self.bashNonInteractive;
  }
  ```

  Or alternatively using the `system.replaceDependencies.replacements`
  NixOS option approach.

While there's also other such `*Interactive` packages that could use the
same treatment, `bash` is a great start.

This was already attempted before in
https://github.com/NixOS/nixpkgs/pull/151227, but was not continued for
unknown reason.

To avoid stdenv becoming bigger, all uses of bash in the (working)
stdenv's are changed to the explicitly non-interactive version here.

This commit will however still cause a mass rebuild for all packages (and reverse deps)
making use of the default bash.
2025-02-05 00:31:46 +01:00
Ben Wolsieffer
a670466186 texinfo: use substituteInPlace --replace-fail
Get rid of the deprecation warning.
2024-10-12 17:47:05 -04:00
Ben Wolsieffer
d604acb136 texinfo: fix reference to build platform coreutils
0e50c09 started patching shebangs for all files in tp/maintain. There
are some Perl modules in tp/maintain/lib with the shebang #!/bin/false
that are eventually installed to the output. In the source tarball, some
of the these file are marked executable, but when they are installed,
the executable bit is cleared. Therefore, they get patched with build
platform shebangs in postPatch, but these shebangs are never corrected
to the host platform in the fixup phase.  This leaves a reference to
build platform coreutils in the output.

It turns out that there is only a single file in tp/maintain that
actually needs to be patched, so limit the patchShebangs call to that
file to avoid the issue.
2024-10-12 17:47:04 -04: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
Nick Cao
2ea2276b30 texinfo: set texinfo_cv_sys_iconv_converts_euc_cn=yes when cross compiling version >= 7.1
Reference: https://lists.openembedded.org/g/openembedded-core/message/197071
2024-07-21 09:57:33 -04:00
Alexis Hildebrandt
3ddf4322fa texinfo: Format with nixfmt 2024-06-10 17:02:11 +02:00
Alexis Hildebrandt
0626ef8124 texinfo: refactor 2024-06-10 17:02:06 +02:00
Alyssa Ross
3df6bb2c85 Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/applications/blockchains/polkadot/default.nix
2024-06-09 22:47:12 +01: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
Audrey Dutcher
846de80d1c various: Enable updateAutotoolsGnuConfigScriptsHook
Prior to August 2023, any config.guess generated by autoconf will
include a hardcoded /usr/bin/uname invocation for FreeBSD on any
architecture other than arm. This clearly doesn't work under nix.
We must then update or otherwise patch each old config.guess.
2024-05-27 11:09:28 -04:00
Audrey Dutcher
9f481b394b texinfo: remove spurious xz buildInput
diffoscope indicates that the builds are the same with and without it.
2024-05-26 11:34:16 -07:00
Audrey Dutcher
f31f33987b texinfo: Fix build on native FreeBSD 2024-05-19 17:56:02 +02:00
Philip Taron
33ae86a951 texinfo: fix issue with libiconv not being passed in by removing top-level with lib statement (#308835) 2024-05-03 20:09:14 +02:00
Yureka
95e064234c texinfo: remove reference to buildPlatform awk 2023-09-16 02:19:22 +02:00
Artturi
e5aabf059e Merge #227471: texinfo: apply gnulib patch only to version 6.7
(cherry picked from commit db3ab32a69)
Fixes build of version 6.5: https://hydra.nixos.org/build/216602149
2023-04-23 09:05:56 +02:00
Adam Joseph
5d64ebd936 texinfo: apply gnulib.passthru.longdouble-redirect-patch
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2023-04-05 15:51:54 -07:00
Alexis Hildebrandt
0e50c09cf4 texinfo: Add version 7.0.2 2023-02-12 11:31:41 +01:00
Guillaume Girol
33afbf39f6 treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have
nativeCheckInputs to do that instead. Doing this treewide change allows
to keep hashes identical to before the introduction of
nativeCheckInputs.
2023-01-21 12:00:00 +00:00
Yureka
75ffef8f2e pkgsMusl.texinfoInteractive: fix build (#193919) 2022-10-06 13:43:43 +02:00
Ben Wolsieffer
30bfac6095 texinfo: fix build references when cross-compiling
The XS modules were being built for the build platform, and the perl scripts
had build platform shebangs.

It is possible to build the XS modules by passing
PERL_EXT_CC=${stdenv.cc.targetPrefix}cc and --enable-perl-xs=yes, but they
fail to load due to a handshake key mismatch. Instead, I just decided to
disable the XS modules and use the pure Perl fallbacks when cross-compiling.

The shebangs were fixed manually using substituteInPlace.
2022-06-20 13:51:44 -04:00
Artturin
1d44ac176c treewide: add enableParallelBuilding's to bootstrap packages so hashes stay the same
when enableParallelBuildingByDefault is enabled

verified with
`nix-diff $(nix eval ".#gcc-unwrapped.drvPath") $(nix eval --expr 'with import ./. { config = { enableParallelBuildingByDefault = true; }; }; gcc-unwrapped.drvPath' --impure)`
2022-05-25 16:03:14 +03:00
Artturin
b0dce7f79b texinfo: enable strictDeps and use libintl instead of gettext optional
libintl is null on linux and gettext on darwin
2022-05-22 16:40:18 +03:00
Maximilian Bosch
69af73d4b0 texinfo: review fixes 2022-02-27 12:11:18 +01:00
Maximilian Bosch
f97b995186 texinfo: fix build w/glibc-2.34 2022-02-27 10:25:39 +01:00
Felix Bühler
d6f7a38ad3 texinfo: rename name to pname&version (#157454) 2022-01-31 00:14:44 -05:00
Sergei Trofimovich
1165533fc3 texinfo: 6.7 -> 6.8 2021-09-20 19:55:19 +01:00
Ben Siraphob
c522fec274 pkgs/development/tools: stdenv.lib -> lib 2021-01-23 20:30:03 +07:00
Christian Kampka
e389e24efc texinfo: Depend on gettext on Darwin
texinfo version 6.7 requires libintl.h which on Linux is provided
by the libc. On Darwin, this lib is provided by gettext instead.
2020-10-06 09:43:42 +02:00
Christian Kampka
765d3e12bc texinfo: patch cross-build in non-interactive build mode 2020-08-22 14:24:34 +02:00
Christian Kampka
fb223f6ab5 texinfo. 6.5 -> 6.7 2020-08-22 14:23:53 +02:00
Matthew Bauer
d0677e6d45 treewide: add warning comment to “boot” packages
This adds a warning to the top of each “boot” package that reads:

  Note: this package is used for bootstrapping fetchurl, and thus cannot
  use fetchpatch! All mutable patches (generated by GitHub or cgit) that
  are needed here should be included directly in Nixpkgs as files.

This makes it clear to maintainer that they may need to treat this
package a little differently than others. Importantly, we can’t use
fetchpatch here due to using <nix/fetchurl.nix>. To avoid having stale
hashes, we need to include patches that are subject to changing
overtime (for instance, gitweb’s patches contain a version number at
the bottom).
2020-07-31 08:56:53 +02:00
Michael Reilly
84cf00f980 treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jan Tojnar
0c2adc0fb1 Merge branch 'staging' into staging-next 2019-12-31 03:59:58 +01:00
Robin Gloster
ba0a3edf7f stdenv: installTargets is a list 2019-12-31 00:24:02 +01:00
Andrew Childs
6dd60c6cac texinfoInteractive: fix cross build 2019-12-30 17:21:39 +01:00
volth
08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
c0bw3b
0498ccd076 Treewide: use HTTPS on GNU domains
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
2018-12-02 15:51:59 +01:00
Jan Malakhovski
2067b2a524 texinfo: cleanup with a mass rebuild 2018-09-23 17:57:13 +00:00
Jan Malakhovski
2ad99bcc82 texinfo: fix perl issues by applying patches from upstream 2018-09-05 16:39:36 +00:00
Jan Malakhovski
0495548f4d texinfo: use checkInputs 2018-08-11 09:35:23 +00:00
Jan Malakhovski
d531a1e967 texinfo: merge expressions for 5.2 and 6.5
Also add me as a maintainer.
2018-04-25 19:50:55 +00:00