| Commit message (Collapse) | Author | Age |
|
|
|
| |
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.
|
|
|
|
|
|
|
| |
The tests need to expand passed variable and very carefully.
I could see no other easy way than to change single-quoting in
makeWrapper to double-quoting.
The tests now fail with the same problem as on master...
|
|\ |
|
| | |
|
| |
| |
| |
| |
| |
| | |
find fails when called with an inexistent search path.
That situation may arise when the output is created after by a postFixup hook.
vcunat amended the PR by clarifying one more `return` to `return 0`.
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There are no users of it in main tree and recent merge
of multiple outputs branch makes it obsolete for private trees
too.
At the time hook was created, recently merged multiple output
branch was relying on passing flags to autotools to split
outputs, which obviously wasn't working for other build systems
Scatter output was taking different approach where files were
moved out from a build tree based on known paths, which is more
or less what current multiple-outputs.sh hook is able to do too.
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| | |
For every *.{exe,dll} in $output/bin/ we try to find all (potential)
transitive dependencies and symlink those DLLs into $output/bin
so they are found on invocation.
(DLLs are first searched in the directory of the running exe file.)
The links are relative, so relocating whole /nix/store won't break them.
The hook is activated on cygwin and when cross-compiling to mingw.
|
| |
| |
| |
| |
| | |
Fixes #14817. The outputs weren't propagated correctly when
cross-building.
|
|/
|
|
|
|
| |
- the default --docdir is typically DATAROOTDIR/doc/pkgName
- I saw no other way than to employ some magic to guess this `pkgName`
- user can override it by setting $shareDocName
|
|\
| |
| |
| |
| |
| | |
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
|
| |
| |
| |
| | |
Stdenv adapters considered weird.
|
|\|
| |
| |
| |
| | |
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
|
| |\ |
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | | |
This still breaks a few packages, but nothing really major:
http://hydra.nixos.org/eval/1241850?filter=x86_64-linux&compare=1237919&full=#tabs-now-fail
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The importance of glibc makes it worthwhile to provide debug
symbols. However, this revealed an issue with separateDebugInfo: it
was indiscriminately adding --build-id to all ld invocations, while in
fact it should only do that for final links. Glibc also uses non-final
("relocatable") links, leading to subsequent failure to apply a build
ID ("Cannot create .note.gnu.build-id section, --build-id
ignored"). So now ld-wrapper.sh only passes --build-id for final
links.
|
| | | | |
|
| | |/
| | |
| | |
| | |
| | | |
`--set FOO ""` is not strictly equivalent to `--unset FOO`. In the former case
the environment variable still exists with an empty string as a value.
|
| |/
| |
| |
| |
| | |
The simple "return" would not override the non-zero error code set by the
preceding test command, therefore aborting scripts running with "set -e".
|
|\|
| |
| |
| |
| | |
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
|
| | |
|
| | |
|
| | |
|
|\|
| |
| |
| | |
Let's get rid of those merge conflicts.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In some cases the $sourceRoot is missing. Skip the hook instead
of showing the following cryptic error:
find: cannot search `': No such file or directory
/nix/store/0p1afvl8jcpi6dvsq2n58i90w9c59vz1-set-source-date-epoch-to-latest.sh: line 12: [: : integer expression expected
vcunat removed the warning; the hook will just skip silently in these cases.
Perhaps someone can improve on it some time.
|
|\| |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
For instance, a binary like libfoo.so will cause a symlink
lib/debug/libfoo.so.debug -> .build-id/<build-ID>.debug to be
created. This is primarily useful for use with eu-addr2line, if you
know the name of a binary and the relative address, but not the build
ID.
|
| | | |
|
| |/
| |
| |
| |
| | |
This provides a timestamp that's more useful than 1970-01-01 yet still
deterministic.
|
| |
| |
| |
| |
| |
| | |
- fix in silencing some moveToOutput messages
- allow removing (developer) documentation even without defining outputs
(note: some paths are auto-removed by default, e.g. gtk-doc and man3)
|
|\| |
|
| |
| |
| |
| | |
Tail is very picky about the space after -c
when compiled by Nix on Illumos (no idea why).
|
| | |
|
|\|
| |
| |
| |
| |
| | |
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
|
| |
| |
| |
| | |
i.e. define it even if $dontWrapGApps is set, and document the intention.
|
| |
| |
| |
| | |
/cc #10351 and @lethalman.
|
| |
| |
| |
| |
| |
| | |
Now any developer docs are removed by default, unless "docdev"
is in $outputs or $outputDocdev is defined.
Currently devdoc consists of just man3 and gtk-doc.
|
| |
| |
| |
| | |
i.e. remove chains of empty dirs after moving contents out of them.
|
| |
| |
| |
| |
| | |
Packages often provide some developer documentation
which is useless to typical users (e.g. man3 and gtk-doc).
|
| |
| |
| |
| |
| |
| |
| | |
'[[ ! -v "$propagatedOutputs" ]]' is incorrect and always evaluates to
true. The correct form using double brackets would be
'[[ ! -v propagatedOutputs ]]', but I strongly dislike '[[ ]]' due to
the totally different quoting rules compared to everything else in bash.
|
| |
| |
| |
| |
| | |
This is required since #7524 is fixed ("stdenv: Errors in hooks (such as
postUnpack) get ignored")
|
|\|
| |
| |
| | |
Many non-conflict problems weren't (fully) resolved in this commit yet.
|