about summary refs log tree commit diff
path: root/pkgs/build-support
Commit message (Collapse)AuthorAge
* Merge #55420: buildEnv, substituteAll: disable binary cacheVladimír Čunát2019-02-22
|\ | | | | | | ... into staging.
| * buildFHSEnv: allowSubstitutes = falsevolth2019-02-08
| | | | | | trivial builder
| * substituteAllFiles: allowSubstitutes = falsevolth2019-02-08
| | | | | | trivial builder
| * substituteAll: allowSubstitutes = false;volth2019-02-07
| | | | | | trivial derivation
| * buildEnv: allowSubstitutes = falsevolth2019-02-07
| | | | | | trivial derivation
* | buildEnv: improve file check to avoid false-positivesMaximilian Bosch2019-02-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge staging-next into stagingFrederik Rietdijk2019-02-21
|\ \
| * | fetchsvn: move defaults to package fileJan Malakhovski2019-02-03
| | |
| * | Merge branch 'staging-next'Vladimír Čunát2019-02-20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | This round is without the systemd CVE, as we don't have binaries for that yet. BTW, I just ignore darwin binaries these days, as I'd have to wait for weeks for them.
| | * \ Merge branch 'master' into staging-nextVladimír Čunát2019-02-19
| | |\ \ | | | | | | | | | | | | | | | Hydra nixpkgs: ?compare=1505754
| | * \ \ Merge master into staging-nextFrederik Rietdijk2019-02-18
| | |\ \ \
| | * \ \ \ Merge branch 'master' into staging-nextVladimír Čunát2019-02-17
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | A mass darwin rebuild from master (#55784).
| | * \ \ \ \ Merge master into staging-nextFrederik Rietdijk2019-02-16
| | |\ \ \ \ \
| * | | | | | | Fix alpha-embedded Target on Hydra (#55725)Vincent Weisner2019-02-19
| | | | | | | |
| * | | | | | | buildBazelPackage: autodetect nix toolchain instead of Xcode one on macOS ↵Uri Baghin2019-02-19
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | (#56033)
* | | | | | | buildEnv: break with a proper error if one path is actually a fileMaximilian Bosch2019-02-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ]; } ```
* | | | | | | Merge remote-tracking branch 'NixOS/master' into stagingMatthew Bauer2019-02-18
|\| | | | | |
| * | | | | | Merge pull request #55859 from nlewo/dockerTools-fix-55290Linus Heckemann2019-02-18
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | dockerTools.buildImage: preserve layers ordering at image repacking
| | * | | | | dockerTools.buildImage: preserve layers ordering at image repackingAntoine Eiche2019-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch preserves the ordering of layers of a parent image when the new image is packed. It is currently not the case: layers are stacked in the reverse order. Fixes #55290
| * | | | | | nix-gitignore: init at v3.0.0 (#46112)Raitis Veinbahs2019-02-18
| | | | | | | | | | | | | | | | | | | | | closes siers/nix-gitignore#6
| * | | | | | Merge branch 'master' into singularityJustin Bedő2019-02-17
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #55035 from uri-canva/bazel-depsRyan Mulligan2019-02-17
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | bazel-deps: 2018-11-01 -> 2019-02-01
| | | * | | | | bazel-deps: 2018-11-01 -> 2019-02-01Uri Baghin2019-02-01
| | | | | | | |
| | * | | | | | mirrorx.nix: add https and http mirrors for gccBen Hipple2019-02-16
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | HTTP is never worse and often better than FTP, since many users may be on networks that do not allow FTP traffic.
| * | | | | | singularity: 2.6.0 -> 3.0.1Justin Bedo2019-01-31
| | | | | | |
* | | | | | | Merge master into stagingFrederik Rietdijk2019-02-14
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | Merge pull request #55129 from oxij/tree/move-defaults-to-package-filesMichael Raskin2019-02-13
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | all-packages.nix: move defaults to package files
| | * | | | fetchsvnssh: move defaults to package fileJan Malakhovski2019-02-03
| | | | | |
* | | | | | Merge master into staging-nextFrederik Rietdijk2019-02-13
|\| | | | |
| * | | | | Document undocumented argument to makeWrapper()deliciouslytyped2019-02-11
| | | | | |
| * | | | | Merge pull request #55003 from volth/patch-303Michael Raskin2019-02-10
| |\ \ \ \ \ | | | | | | | | | | | | | | linkFarm: hacky quoting -> escapeShellArg
| | * | | | | linkFarm: allowSubstitutes = falsevolth2019-02-08
| | | | | | | | | | | | | | | | | | | | | trivial builder
| | * | | | | linkFarm: hacky quoting -> escapeShellArgvolth2019-01-31
| | |/ / / /
| * | | | | Merge branch 'master' into staging-nextVladimír Čunát2019-02-06
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Hydra nixpkgs: ?compare=1503899
* | \ \ \ \ \ Merge remote-tracking branch 'origin/master' into stagingMatthew Bauer2019-02-09
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #54626 from FlorianFranzen/bionicEelco Dolstra2019-02-05
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | buid-support: Add Ubuntu bionic base images
| | * | | | | buid-support: Add Ubuntu bionic base imagesFlorian Franzen2019-01-26
| | | | | | |
* | | | | | | Merge pull request #54578 from alyssais/gcj-darwinAlyssa Ross2019-02-08
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | gcj: fix build on Darwin
| * | | | | | gcj: fix build on DarwinAlyssa Ross2019-01-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially addresses https://github.com/NixOS/nixpkgs/issues/29715.
* | | | | | | Merge pull request #54909 from ↵Jan Tojnar2019-02-01
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tollb/fix/wrap-gapps-hook_unnecessary_symlink_wrap wrap-gapps-hook.sh: only wrap links when required
| * | | | | | | wrap-gapps-hook.sh: only wrap links when requiredBruce Toll2019-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unless dontWrapGapps is set, the wrap-gapps-hook.sh will currently wrap all executables (and symbolic links to executables) found under the target directories: bin and libexec. As a result, if a symbolic link in a target directory points to an executable in a target directory, both will get wrapped. This causes an extra shell/exec when following the symbolic link, as well as increasing the size of the final executable's environment. To avoid wrapping a link to an already wrapped executable, this commit splits the determination of what gets wrapped into two phases: 1. All binaries under the target directories are wrapped and logged with "Wrapping program ..." 2. All links to executables under the target directories are identified and checked to see if they reference an executable under one of the target directories. If yes, the required wrapping has already been performed on the associated binary (in phase 1), so no wrapping is done and "Not wrapping link: ... (already wrapped)" is logged. If no, the link points at an executable that hasn't been wrapped, so the link is wrapped and "Wrapping link: ..." is logged. As an example, the yelp package has a bin directory that contains an executable "yelp" and a symbolic link "gnome-help" -> "yelp". Prior to this commit, the bin directory would contain these files after wrapping: gnome-help -- wrapper to exec .gnome-help-wrapped .gnome-help-wrapped -- a symbolic link to yelp yelp -- wrapper to exec .yelp-wrapped .yelp-wrapped -- the original yelp binary After this commit, the bin directory will instead contain: gnome-help -- a symbolic link to yelp yelp -- wrapper to exec .yelp-wrapped .yelp-wrapped -- the original yelp binary NOTE: The primary motivation for this commit is to avoid obscuring the fact that two or more paths are simple aliases and expected to behave identically. It also reduces the likelihood of hitting limits related to environment variable size. LIMITATION: The method used above is intended to be conservative and will still wrap symbolic links to other symbolic links when the ultimate target is outside of bin or libexec.
* | | | | | | | Merge branch 'staging-next' into stagingVladimír Čunát2019-02-01
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'master' into staging-nextVladimír Čunát2019-02-01
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comments on conflicts: - llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is to build all targets, so we should be fine - some pypi hashes: they were equivalent, just base16 vs. base32
| | * | | | | cc-wrapper: set priority to 10Matthew Bauer2019-01-31
| | | | | | |
| | * | | | | runInLinuxVM: pkgs.linux -> kernelvolth2019-01-29
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | There is a function params `kernel' intended to specify which kernel to use. It defaults to `pkgs.linux`. But when we override `kernel', compiling and using two kernels seems not to be the intendend bevavior.
| | * | | | all-packages: move fetch* to pkgs/build-support/Matthew Bauer2019-01-26
| | | |/ / | | |/| |
| * | | | Merge master into staging-nextFrederik Rietdijk2019-01-20
| |\ \ \ \
* | \ \ \ \ Merge pull request #54624 from matthewbauer/libcxxMatthew Bauer2019-01-27
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | cc-wrapper: add libcxx for libcxxClang
| * | | | | cc-wrapper: add libcxx for libcxxClangMatthew Bauer2019-01-26
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clang needs to find headers + libraries for compiling with libc++. We need to add a libcxx argument to cc-wrapper. This means you do not have to pass in c++ headers directly. This resolves the last case remaining of #30670. Darwin clang++ now works properly. Fixes #30670
* | | | | Merge branch 'master' into stagingVladimír Čunát2019-01-22
|\| | | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-23 13:30:09 +0000