| Commit message (Collapse) | Author | Age |
| |
|
|
|
|
|
| |
> bash: warning: command substitution: ignored null byte in input
/cc #28227. Also break the overlong line.
|
|
|
|
|
| |
`findInputs` is a stdenv/setup helper we should strive not to call
elsewhere. Using normal deps is more idiomatic anyways.
|
|\ |
|
| | |
|
| |
| |
| |
| | |
set-source-date-epoch-to-latest.sh to ignore files newer than "$NIX_BUILD_TOP/.." (unlike "$NIX_BUILD_TOP" it is root-owned and cannot be touched by nixbld1).
|
| | |
|
| |
| |
| |
| |
| | |
All the other plain variable references (before e1d46c0c4) are without
braces.
|
| |
| |
| |
| |
| |
| | |
Because if you were to disable man pages via 'programs.man.enable',
the "man" output wouldn't be installed and the info pages would go
missing.
|
| |
| |
| |
| |
| | |
Because .doc is normally not installed to user environments, these
manpages are unaccessible by default otherwise.
|
|\ \
| |/
|/| |
replace "Mac OS X" and "OS X" with "macOS"
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
as it is the official name since 2016
https://en.wikipedia.org/wiki/Macintosh_operating_systems#Desktop
exception are parts refering to older versions of macOS like
"GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later [...]"
|
| |
| |
| |
| |
| | |
In some cases wrappers could not be made. See e.g.
https://github.com/NixOS/nixpkgs/pull/24944#issuecomment-321175692
|
|\ \
| | |
| | | |
makeWrapper: Fail loudly when misused
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
`makeWrapper` and `wrapProgram` are being invoked on all kinds of
wacky things (usually with the help of bash globs or other machine
assistance).
So far, I have come across `wrapProgram` being invoked on a directory,
as well as on the empty string.
As far as I can tell, it's only valid to invoke these utilities on a
normal (non-directory, non-device) executable file. This commit
enforces that precondition.
|
|\ \
| | |
| | | |
Fix makewrapper unsupported args
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previously, makeWrapper would accept arguments it didn't recognize,
potentially allowing argument misspellings or broken callers.
Now, makeWrapper dies with a backtrace if it is called incorrectly.
Also changes `wrapProgram` so that it doesn't pass through the first
argument twice --- this was tripping up the argument checking.
|
| |/
| |
| |
| |
| | |
Calling `die "Error message"` causes the current script to exit with
an error, printing a backtrace
|
|\ \
| |/
|/| |
polari: unbreak
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some programs store the executable in a different place and link it
from the `bin` directory. For example, Polari links `$out/bin/polari`
to `$out/share/polari/org.gnome.Polari`. `wrapGAppsHook` did not follow
symlinks so it was not able to wrap Polari, making it unable to access
GObject introspection definitions required for running the program.
I made the wrapping script follow symlinks to fix this corner case.
|
|/
|
|
|
|
|
|
| |
This setup hook is propagated by gdb. Thus, a typical use is:
$ nix-shell -p gdb nix nix.debug sqlite.debug ...
and gdb will be able find the debug symbols of nix etc. automatically.
|
|
|
|
|
|
|
|
|
|
| |
As @oxij points out in [1], this breakage is especially serious because
it changes the contents of built environments without a corresonding
change in their hashes. Also, the revert is easier than I thought.
This reverts commit 3cb745d5a69018829ac15f7d5a508135f6bda123.
[1]: https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This makes those files a bit easier to read. Also, for what it's worth,
it brings us one baby step closer to handling spaces in store paths.
Also, I optimized handling of many transitive deps with read. Probably,
not very beneficial, but nice to enforce the pkg-per-line structure.
Doing so let me find much dubious code and fix it.
Two misc notes:
- `propagated-user-env-packages` also needed to be adjusted as
sometimes it is copied to/from the propagated input files.
- `local fd` should ensure that file descriptors aren't clobbered
during recursion.
|
|
|
|
|
|
|
|
|
|
| |
This will override the existing winsymlinks setting. nativestrict
will cause ln to fail if it's unable to create a native symlink.
Native symlinks are required for the windows dll loader to find the
libraries.
This script is also used for cross-mingw, but setting CYGWIN
shouldn't cause a problem.
|
| |
|
| |
|
|\
| |
| | |
wrapGAppsHook: Correct `wrapProgram` invocations
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This change fixes several defects in the way `wrapGAppsHook` selected
the executable to wrap.
Previously, it would wrap any top-level files in the target `/bin` and
`/libexec` directories, including directories and non-executable
files. In addition, it failed to wrap files in subdirectories.
Now, it uses `find` to iterate over these directory hierarchies,
selecting only executable files for wrapping.
|
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 8b9f153bb9c8156ec4f3d56d61845e432d19dcd6 of
https://github.com/NixOS/nixpkgs/pull/25183 because it breaks builds of
packages that don't install both a "bin" and a "libexec" directory. See
https://github.com/NixOS/nixpkgs/pull/25183#issuecomment-298064769 for more
details.
|
|\ \
| | |
| | | |
wrapGAppsHook: Correct `wrapProgram` invocations
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This change fixes several defects in the way `wrapGAppsHook` selected
the executable to wrap.
Previously, it would wrap any top-level files in the target `/bin` and
`/libexec` directories, including directories and non-executable
files. In addition, it failed to wrap files in subdirectories.
Now, it uses `find` to iterate over these directory hierarchies,
selecting only executable files for wrapping.
|
|/ |
|
|
|
|
|
|
| |
Fixes https://github.com/NixOS/nixpkgs/pull/22962#commitcomment-21144939
Also run ShellCheck.
|
|\
| |
| |
| | |
More larger rebuilds from master, unfortunately.
|
| | |
|
|/ |
|
|
|
|
|
|
| |
Because of bash 4.4 the semantics GLOBIGNORE changed.
This resulted in already compressed manpages to be compressed twice.
Also be careful about symlinks to fix #21777, e.g. the ledger example.
|
|
|
|
|
| |
Some package had a broken symlink named config.sub, and the script would
fail.
|
|\ |
|
| |
| |
| |
| |
| |
| | |
extraFlagsArray should not be exposed outside of `makeWrapper`, it
should only be possible to set it inside a script supplied via the
`--run` argument.
|
| |
| |
| |
| |
| | |
Add function documentation to `makeWrapper`.
Also add user documentation to the nixpkgs manual.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is required for Aarch64 since a lot of source tarballs ship with
outdated configure scripts that don't recognize aarch64. Simply
replacing the config.guess and config.sub with new versions from
upstream makes them build again.
This same approach is used by at least Buildroot and Fedora. In
principle this could be enabled for all architectures but
conditionalizing this on aarch64 avoids a mass rebuild on x86.
|
| |
| |
| |
| | |
if a dll is symlink then dll files from the symlinked
directory need to be taken
|
|/
|
|
|
|
|
|
| |
I believe this reduces surprises and is actually simpler semantically.
This is important e.g. for relative symlinks when moving both source
and target - now the order of moving won't matter.
Fixes #20723 (a particular instance of the surprise).
|
|
|
|
| |
For consistency with the devdoc output.
|
|
|
|
|
|
| |
They now go to devman, devdoc, or $outputMan, in that order. This is
to prevent cases such as the man-pages package quietly losing its
section 3 pages.
|
|
|
|
|
| |
It's "developer documentation", not "documentation developer" after
all.
|
|
|
|
| |
Because 'dev' will most often not be the default output after my changes.
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Prior to this commit, trailing whitespace would be introduced when
modifying '#!' lines with no arguments. For example (whitespace added):
/nix/store/.../foo: interpreter directive changed
from "/bin/bash"
to "/nix/store/...-bash-4.3-p42/bin/bash "
/nix/store/.../bar: interpreter directive changed
from "/bin/baz wef"
to "/nix/store/...-baz wef "
We add a sed command to strip trailing whitespace, so the above commands
would drop the two spaces after "bash", or the one space after "baz wef".
abbradar: fixed commit title
Closes #16785.
|