summary refs log tree commit diff
path: root/pkgs/build-support
Commit message (Collapse)AuthorAge
* dockerTools.pullImage: expose image* attributes (#41366)lewo2018-06-03
| | | | | Attributes `imageName` and `imageTag` are exposed if the image is built by our Nix tools but not if the image is pulled. So, we expose these attributes for convenience and homogeneity.
* Merge pull request #41065 from Ralith/sanitizer-fixJohn Ericson2018-05-29
|\ | | | | clang_6: fix sanitizers under libstdc++
| * clang_6: fix sanitizers under libstdc++Benjamin Saunders2018-05-24
| |
* | mirrors: remove obsolete mysql mirrorOrivej Desh2018-05-29
| | | | | | | | It does not contain any of the versions currently in Nixpkgs.
* | Merge branch 'master' into stagingJan Malakhovski2018-05-26
|\ \ | |/ |/| | | | | | | Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master
| * Merge pull request #40947 from samueldr/fix/34779lewo2018-05-24
| |\ | | | | | | dockerTools: fixes extraCommands for mkRootLayer.
| | * tests/docker-tools: Adds regression test for #34779Samuel Dionne-Riel2018-05-24
| | |
| | * dockerTools: fixes extraCommands for mkRootLayer.Samuel Dionne-Riel2018-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The extraCommands was, previously, simply put in the body of the script using nix expansion `${extraCommands}` (which looks exactly like bash expansion!). This causes issues like in #34779 where scripts will eventually create invalid bash. The solution is to use a script like `run-as-root`. * * * Fixes #34779
| * | skopeo: 0.1.29 -> 0.1.30Antoine Eiche2018-05-24
| | | | | | | | | | | | | | | | | | | | | Skopeo used by our docker tools was patched to work in the build sandbox (it used /var/tmp which is not available in the sandbox). Since this temporary directory can now be set at build time, we remove the patch from our docker tools.
* | | Merge remote-tracking branch 'upstream/staging' into compiler-rtJohn Ericson2018-05-24
|\ \ \
| * | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-23
| |\| |
| * | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-21
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into stagingVladimír Čunát2018-05-20
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-05-18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/top-level/all-packages.nix
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the dontCheck because the test suite fails, get rid of the LDFLAGS hack because we don't need it!
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/staging' into strictDepsJohn Ericson2018-05-14
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into stagingMatthew Bauer2018-05-08
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #40139 from obsidiansystems/modular-setup-hooksJohn Ericson2018-05-07
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | treewide: Modular setup hooks
| | | * | | | | | | {bintools,cc}-wrapper: Factor out role accumulation logicJohn Ericson2018-05-07
| | | | | | | | | |
| | | * | | | | | | treewide: Use pkgs/build-support/roles.bash to remove copy pastaJohn Ericson2018-05-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix some setup hooks that unnecessarily used environment hooks, which revolted in the same variable being modified too many times.
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-05-03
| | |\| | | | | | |
| | * | | | | | | | Merge branch 'staging' into fix-ncurses-darwin-extensionsMatthew Justin Bauer2018-05-02
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge pull request #39458 from oxij/stdenv/beautificationsJohn Ericson2018-04-26
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | stdenv: better names for cc and bintools
| | | | * | | | | | | | bintools-wrapper, cc-wrapper: don't add `targetPrefix` the second timeJan Malakhovski2018-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... binutils and gcc add it already anyway. Without this it's easy to get cross-toolchain paths longer than 256 chars and nix-daemon will then fail to commit them to /nix/store on XFS.
| | | * | | | | | | | | Merge remote-tracking branch 'origin/master' into stagingWill Dietz2018-04-24
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge branch 'master' into stagingDaiderd Jordan2018-04-24
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge pull request #34968 from timokau/rust-findDaiderd Jordan2018-04-23
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | buildRustPackage: Restrict `find` to files
| | | | * | | | | | | | | | buildRustPackage: Restrict `find` to filesTimo Kaufmann2018-02-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `find -executable` finds everything with the executable bit set, including directories. Thats not harmful in this scenario as `cp` won't copy those directories, but it does result in a few warning messages.
| | | * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into HEADTuomas Tynkkynen2018-04-22
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/development/tools/misc/binutils/default.nix
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into HEADTuomas Tynkkynen2018-04-16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/version-management/git-and-tools/git/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/unix-tools.nix
| | | * | | | | | | | | | | | | {cc,bintools}-wrapper: fix removal of unsupported hardening flagsPiotr Bogdan2018-04-14
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into stagingJan Tojnar2018-04-12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Revert "Revert "Merge pull request #28029 from cstrahan/hardening-fix""John Ericson2018-04-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6c064e6b1f34a8416f990db0cc617a7195f71588, reapplying PR #28029 which was supposed to have gone to staging all along.
| * | | | | | | | | | | | | | | | treewide: Get rid of all uses of crossConfigJohn Ericson2018-05-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hack of using `crossConfig` to enforce stricter handling of dependencies is replaced with a dedicated `strictDeps` for that purpose. (Experience has shown that my punning was a terrible idea that made more difficult and embarrising to teach teach.) Now that is is clear, a few packages now use `strictDeps`, to fix various bugs: - bintools-wrapper and cc-wrapper
| * | | | | | | | | | | | | | | | treewide: isArm -> isAarch32John Ericson2018-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following legacy packing conventions, `isArm` was defined just for 32-bit ARM instruction set. This is confusing to non packagers though, because Aarch64 is an ARM instruction set. The official ARM overview for ARMv8[1] is surprisingly not confusing, given the overall state of affairs for ARM naming conventions, and offers us a solution. It divides the nomenclature into three levels: ``` ISA: ARMv8 {-A, -R, -M} / \ Mode: Aarch32 Aarch64 | / \ Encoding: A64 A32 T32 ``` At the top is the overall v8 instruction set archicture. Second are the two modes, defined by bitwidth but differing in other semantics too, and buttom are the encodings, (hopefully?) isomorphic if they encode the same mode. The 32 bit encodings are mostly backwards compatible with previous non-Thumb and Thumb encodings, and if so we can pun the mode names to instead mean "sets of compatable or isomorphic encodings", and then voilà we have nice names for 32-bit and 64-bit arm instruction sets which do not use the word ARM so as to not confused either laymen or experienced ARM packages. [1]: https://developer.arm.com/products/architecture/a-profile (cherry picked from commit ba52ae50488de85a9cf60a3a04f1c9ca7122ec74)
* | | | | | | | | | | | | | | | | tests.cc-wrapper: verify building with sanitizersBenjamin Saunders2018-05-24
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #39214 from seppeljordan/add-nix-prefetch-githubJörg Thalheim2018-05-23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | Add nix-prefetch-github
| * | | | | | | | | | | | | | | nix-prefetch-github: init -> 1.3Sebastian Jordan2018-05-22
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | requireFile: Use stdenvNoCCJohn Ericson2018-05-21
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need for a C compiler
* | | | | | | | | | | | | | curl-sys: fix linking against zlibP-E-Meunier2018-05-20
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | buildRustCrate: add extraLinkFlags parameterP-E-Meunier2018-05-20
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful when build scripts do not apply linking flags
* | | | | | | | | | | | | crate-overrides: curl-sys needs zlibMatthew Bauer2018-05-17
| | | | | | | | | | | | |
* | | | | | | | | | | | | rust: add more sys overridesMatthew Bauer2018-05-17
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | trivial-builders.nix: support directories in requireFileAlexandre Esteves2018-05-16
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Allow recursive hash for requireFile so it can support directories (#40568)
* | | | | | | | | | | dockerTools.pullImage: Fix build with sandboxingaszlig2018-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression introduced in 736848723e5aefa5d24396c58dc6de603399efde. This commit most certainly hasn't been tested with sandboxing enabled and breaks not only pullImage but also the docker-tools NixOS VM test because it doesn't find it's certificate path and also relies on /var/tmp being there. Fixing the certificate path is the easiest one because it can be done via environment variable. I've used overrideAttrs for changing the hardcoded path to /tmp (which is available in sandboxed builds and even hardcoded in Nix), so that whenever someone uses Skopeo from all-packages.nix the path is still /var/tmp. The reason why this is hardcoded to /var/tmp can be seen in a comment in vendor/github.com/containers/image/storage/storage_image.go: Do not use the system default of os.TempDir(), usually /tmp, because with systemd it could be a tmpfs. With sandboxed builds this isn't the case, however for using Nix without NixOS this could turn into a problem if this indeed is the case. So in the long term this needs to have a proper solution. In addition to that, I cleaned up the expression a bit. Tested by building dockerTools.examples.nixFromDockerHub and the docker-tools NixOS VM test. Signed-off-by: aszlig <aszlig@nix.build> Cc: @nlewo, @Mic92, @Profpatsch, @globin, @LnL7
* | | | | | | | | | | Merge pull request #39957 from enumatech/fix/nix-prefetch-git-spacesadisbladis2018-05-04
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nix-prefetch-git: fix handling of submodules with spaces
| * | | | | | | | | | | nix-prefetch-git: fix handling of submodules with spacesLionello Lunesu2018-05-04
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script would parse the output of `git submodule status` but didn't handle paths with spaces in them. This would result in the following error when trying to determine the URL of the submodule: error: key does not contain a section: .url
* / | | | | | | | | | runInLinuxVM: fix ext4 and crc32c-intel interactionsMichael Bishop2018-05-03
|/ / / / / / / / / /
* | | | | | | | | | fetchs3: allow to name the derivation output (#39823)zimbatm2018-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fetchs3: add configurable name Change the default from "foo" to the basename of the s3 URL and make it configurable. * fetchs3: fix error on missing credentials.session_token The session token should default to null instead of failing * fetchs3: make use of the region argument Set it to null if you don't want to use it * fetchs3: prefer local build Fetcher-types spend more time on network than CPU
* | | | | | | | | | dockerTools.pullImage: Skopeo pulls images by digestAntoine Eiche2018-05-02
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skopeo is used to pull images from a Docker registry (instead of a Docker deamon in a VM). An image reference is specified with its name and its digest which is an immutable image identifier (unlike image name and tag). Skopeo can be used to get the digest of an image, for instance: $ skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'