| Commit message (Collapse) | Author | Age |
|---|
| |
|
|
|
|
|
|
|
|
|
|
| |
Previously it was awkward to use the runCommand-variants with
passAsFile as a double definition of passAsFile would potentially
break runCommand: passAsFile would overwrite the previous definition,
defeating the purpose of setting it in runCommand in the first place.
This is now fixed by concatenating the [ "buildCommand" ] list with
one the one from env, if present.
Adjust buildEnv where passAsFile = null; was passed in some cases,
breaking evaluation since it'd evaluate to [ "buildCommand" ] ++ null.
|
| |
|
|
|
|
|
|
| |
Since #112276, we should always put `makeWrapper` in
`nativeBuildInputs`. But `buildEnv` was saying put it in `buildInputs`.
That's wrong!
Fix the instructions, and make the right thing possible.
|
| |
|
|
|
|
|
|
| |
When building an environment if two paths conflict but one or both are
symbolic links and they resolve to the same real path, the conflict is
discarded because the contents of both paths are the same. One of them
is chosen and there is no need to recur into them in order to build
deeper symbolic links.
|
| |
|
|
| |
Fixes #32683
|
| |\
| |
| |
| | |
... into staging.
|
| | |
| |
| | |
trivial derivation
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The original change in #55372 was supposed to fix the case where a store
path which is a file should be placed into `buildEnv` which broke with a
fairly misleading Perl error.
Unfortunately this introduced a regression, `findFiles` can have targets
that are files if the file isn't a store path. Rather than adding more
obscure checks with probably further regressions, I figured that it's
better to replicate the behavior of `lib.isStorePath` and explicitly
check if the store path is a file and break in this case only.
This should also fix recent staging issues.
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
I noticed by creating `buildEnv` where I accidentally put a derivation
from `pkgs.writeText` into `paths` and got a broken build with the
following misleading error message:
```
Use of uninitialized value $stat1 in numeric ne (!=) at /nix/store/9g4wc31j7a2xp22xpgwr0qssfxahxdzl-builder.pl line 74.
Use of uninitialized value $stat1 in bitwise and (&) at /nix/store/9g4wc31j7a2xp22xpgwr0qssfxahxdzl-builder.pl line 75.
different permissions in `' and `/nix/store/0vy5ss91laxvwkyvrbld5hv27i88qk5w-noise': 0000 <-> 0444 at /nix/store/9g4wc31j7a2xp22xpgwr0qssfxahxdzl-builder.pl line 75.
```
It can be reproduced with an expression like this:
``` nix
{ pkgs ? import <nixpkgs> { } }:
let
file = pkgs.writeText "test" ''
content
'';
in
pkgs.buildEnv {
name = "test-env";
paths = [ /* ... */ file ];
}
```
|
| |\
| |
| | |
Make buildEnv overridable
|
| | |
| |
| |
| |
| |
| |
| |
| | |
callPackage already calls makeOverridable, but that just
makes the function that evaluates to buildEnv overridable,
not buildEnv itself.
If no overridable version of buildEnv is used during construction,
users can't override e.g. `paths` at all
|
| |/
|
|
|
|
|
|
|
| |
Since 3cb745d5a69018829ac15f7d5a508135f6bda123, the format of
propagated-user-env-packages has changed and propagated packages have not been
included by buildenv, including in the system environment.
The buildenv builder is modified to read propagated-user-env-packages
line-by-line, instead of expecting all packages on one line.
|
| | |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch fixes #16614 and #16741.
The first issue was caused by the fact that both `/share` and
`/share/fish/vendor_completions.d` end in the `pathsToLink`. The
`pkgs/build-support/buildenv/builder.pl` creates `/share`, then links
`/share/fish` under `/share` and then tries to create the directory
`/share/fish/vendor_completions.d` and fails because it already exists.
The simplest way to reproduce the issue is to build the next Nix
expression:
```nix
let pkgs = import <nixpkgs> { };
in pkgs.buildEnv {
name = "buildenv-issue";
paths = [
pkgs.fish
pkgs.vim
];
pathsToLink = [
"/share"
"/share/fish/vendor_completions.d"
];
}
```
The second issue is more critical and was caused by the fact findFiles
doesn't recurse deep enough. It stops at first unique directory for the
package (e.g., "/share" or even "/") and later the scripts decides it
shouldn't link it as it doesn't match pathsToLink (e.g., "/share/fish"),
so the result is empty.
The test:
```nix
let pkgs = import <nixpkgs> { };
in pkgs.buildEnv {
name = "buildenv-issue";
paths = [
pkgs.fish
pkgs.vim
];
pathsToLink = [
"/share/fish/functions"
];
}
```
or
```nix
let pkgs = import <nixpkgs> { };
in pkgs.buildEnv {
name = "buildenv-issue";
paths = [
pkgs.vim
];
pathsToLink = [
"/share"
];
}
```
|
| |
|
|
|
|
| |
I supplied meta.outputsToInstall automatically in all
mkDerivation products, but some packages still don't use it.
The reported case: jekyll -> bundlerEnv -> buildEnv -> runCommand.
|
| |
|
|
| |
This is to get more consistent with `meta.outputsToInstall`.
|
| |
|
|
|
|
| |
As a result `systemPackages` now also respect it.
Only nix-env remains and that has a PR filed:
https://github.com/NixOS/nix/pull/815
|
| |\ |
|
| | |\
| | |
| | |
| | | |
Let's get rid of those merge conflicts.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Regression introduced by 4529ed12590d7f814e40223437c7df4fea492e2d.
I've missed this in #5096, not because of a messed up rebase as I have
guessed from a comment on #12635 but missed this in the first place.
The testing I did while working on the pull request weren't exhaustive
enough to cover this, because I haven't tested with packages that use
the propagatedUserEnvPkgs attribute.
In order to make the test a bit more exhaustive this time, let's test it
using:
nix-build -E 'with import ./. {}; buildEnv {
name = "testenv";
paths = [
pkgs.hello pkgs.binutils pkgs.libsoup pkgs.gnome3.yelp
pkgs.gnome3.totem
];
}'
And with this commit the errors no longer show up and the environment is
built correctly.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #12635
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Checking file contents is redundant in this case, because we will go
ahead anyway, regardless of whether the content is the same.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Originally wanted to include ignoreCollisions in cups-progs, but I think
it's better if we use ignoreCollisions only if there are _real_
collisions between files with different contents.
Of course, we also check whether the file permissions match, so you get
a collision if contents are the same but the permissions are different.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Now `pkg.outputUnspecified = true` but this attribute is missing in
every output, so we can recognize whether the user chose or not.
If (s)he didn't choose, we put `pkg.bin or pkg.out or pkg` into
`systemPackages`.
- `outputsToLink` is replaced by `extraOutputsToLink`.
We add extra outputs *regardless* of whether the user chose anything.
It's mainly meant for outputs with docs and debug symbols.
- Note that as a result, some libraries will disappear from system path.
|
| |\| |
|
| | | |
|
| |/ |
|
| | |
|
| |\ |
|
| | |
| |
| |
| |
| | |
This is necessary to get stuff like separate manpages, info files,
debug symbols, etc.
|
| |/ |
|
| | |
|
| | |
|
| |
|
|
| |
This gets rid of a bunch of collision warnings.
|
| | |
|
| |
|
|
| |
This mimicks buildenv in Nix more closely.
|
| |
|
|
| |
svn path=/nixpkgs/trunk/; revision=33935
|
| |
|
|
|
|
|
| |
NixOS VM tests to be built on Ubuntu, where /bin/sh is dash rather
than bash.
svn path=/nixpkgs/trunk/; revision=24592
|
| |
|
|
|
|
| |
"/share/info" that it doesn't match "/share/information.nix".
svn path=/nixpkgs/trunk/; revision=23059
|
| |
|
|
| |
svn path=/nixpkgs/trunk/; revision=23026
|
| |
|
|
|
|
| |
but in the postBuild hook.
svn path=/nixpkgs/trunk/; revision=22527
|
| |
|
|
|
|
|
| |
them. This prevents unnecessary unlink operations to resolve
collisions between directories.
svn path=/nixpkgs/trunk/; revision=22526
|
| |
|
|
| |
svn path=/nixpkgs/trunk/; revision=21076
|
| |
|
|
| |
svn path=/nixpkgs/trunk/; revision=21075
|
| |
|
|
| |
svn path=/nixpkgs/trunk/; revision=21004
|
| |
|
|
|
|
| |
This partially reverts commit -r 16100
svn path=/nixpkgs/trunk/; revision=16107
|
| |
|
|
|
|
| |
client
svn path=/nixpkgs/trunk/; revision=16100
|
| |
|
|
| |
svn path=/nixpkgs/trunk/; revision=14142
|
| |
|
|
| |
svn path=/nixpkgs/trunk/; revision=8785
|
| |
|
|
| |
svn path=/nixpkgs/trunk/; revision=8166
|
|
|
ignoring collisions and selectively including directories.
svn path=/nixpkgs/trunk/; revision=7160
|