summary refs log tree commit diff
path: root/pkgs/build-support
Commit message (Collapse)AuthorAge
* buildRustPackage: allow passthru overrideszimbatm2017-10-26
| | | | Don't ignore the passthru that could be passed to the derivation
* Add function closureInfo to replace pathsFromGraphEelco Dolstra2017-10-25
| | | | | | | Unlike pathsFromGraph, on Nix 1.12, this function produces a registration file containing correct NAR hash/size information. https://hydra.nixos.org/build/62832723
* pathsFromGraph: Remove obsolete printManifest featureEelco Dolstra2017-10-25
|
* rust: update cargo builder to fetch registry dynamicallyKevin Cox2017-10-23
| | | | | | | | | | | | | | | | | | | | | | | | | | The biggest benefit is that we no longer have to update the registry package. This means that just about any cargo package can be built by nix. No longer does `cargo update` need to be feared because it will update to packages newer then what is available in nixpkgs. Instead of fetching the cargo registry this bundles all the source code into a "vendor/" folder. This also uses the new --frozen and --locked flags which is nice. Currently cargo-vendor only provides binaries for Linux and macOS 64-bit. This can be solved by building it for the other architectures and uploading it somewhere (like the NixOS cache). This also has the downside that it requires a change to everyone's deps hash. And if the old one is used because it was cached it will fail to build as it will attempt to use the old version. For this reason the attribute has been renamed to `cargoSha256`. Authors: * Kevin Cox <kevincox@kevincox.ca> * Jörg Thalheim <Mic92@users.noreply.github.com> * zimbatm <zimbatm@zimbatm.com>
* buildFHSEnv: fix NIX_* compiler flagsNikolay Amiantov2017-10-17
| | | | This is needed now after #27672.
* Merge pull request #30150 from copumpkin/no-rpath-nonsenseDaniel Peebles2017-10-08
|\ | | | | Get rid of most @rpath nonsense on Darwin
| * Get rid of most @rpath nonsense on DarwinDan Peebles2017-10-08
| | | | | | | | | | | | This requires some small changes in the stdenv, then working around the weird choice LLVM made to hardcode @rpath in its install name, and then lets us remove a ton of annoying workaround hacks in many of our Go packages. With any luck this will mean less hackery going forward.
* | Merge branch 'master' into stagingVladimír Čunát2017-10-07
|\ \ | |/ |/| | | Hydra: ?compare=1399476
| * trivial-builders.nix: fix writeShellScriptBinNikita Uvarov2017-10-06
| | | | | | The check should be performed on the target shell script, not on the output directory.
* | Merge branch 'master' into stagingOrivej Desh2017-10-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (48 commits) Mathematica: 11.0.1 -> 11.2.0 kbfs: 20170922.f76290 -> 20171004.40555d packer: 1.0.3 -> 1.1.0 libxdg-basedir: 1.0.2 -> 1.2.0 fscrypt: 0.2.1 -> 0.2.2 devtodo: init at 0.1.20 keybase: 1.0.30 -> 1.0.33 elixir: Fix locale problem on NixOS keybase-gui: 1.0.25 -> 1.0.33 terraform: 0.10.2 -> 0.10.7 (#30055) emby: 3.2.32.0 -> 3.2.33.0 sbcl: 1.3.21 -> 1.4.0 ardour: 5.11 -> 5.12 axoloti: fix evaluation axoloti: init at 1.0.12-1 melpa-packages: Add new lean packages fastlane: init at 2.60.1 nixos/traefik: guard example path go-ethereum: 1.7.0 -> 1.7.1 xzgv: 0.9.1 -> 0.9.2 ...
| * fetchpatch: allow callers to specify postFetch sensiblyDan Peebles2017-10-03
| | | | | | | | | | Before this fix, it seemed to be trying to merge our postFetch with the patch normalization logic, but accidentally clobbering the whole thing with the passed-in value.
* | Merge pull request #29568 from obsidiansystems/cc-wrapper-32Eelco Dolstra2017-10-02
|\ \ | | | | | | cc-wrapper: Clean up dynamic linking with x86 multilib
| * | cc-wrapper: Clean up dynamic linking with x86 multilibJohn Ericson2017-09-28
| | | | | | | | | | | | | | | It's better layering to do everything in ld-wrapper. Also, use numeric comparisons for `relocatable`.
| * | Merge branch 'cc-wrapper-stdenvNoCC' into ericson2314-cross-baseJohn Ericson2017-09-28
| |\ \
* | \ \ Merge branch 'master' into stagingOrivej Desh2017-10-02
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (271 commits) pysmbc: clarify license pysmbc: fix license bazel: 0.5.4 -> 0.6.0 (#29990) googler: init at 3.3 go: declare support for aarch64 firefox-beta-bin: 56.0b5 -> 57.0b4 spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26 gogs: 0.11.19 -> 0.11.29 grafana: 4.5.1 -> 4.5.2 mopidy-iris: 3.4.1 -> 3.4.9 nextcloud: 12.0.2 -> 12.0.3 haskell-json-autotype: jailbreak to fix build within LTS 9.x kore: fix up kore: init at 2.0.0 glusterfs service: fix issues with useRpcbind tig: 2.2.2 -> 2.3.0 haskell-hspec-core: enable test suite again hackage-packages.nix: automatic Haskell package set update librsvg: fix thumbnailer path awscli: 1.11.108 -> 1.11.162 ...
| * | | dockerTools: fix hash to accomodate the pullImage revertRobin Gloster2017-09-28
| | | |
| * | | Revert "dockerTools.pullImage: use skopeo to pull the image"Robin Gloster2017-09-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 01174c5f4d7df0fd0928fbf8a2a8e633a9cf54aa. See https://github.com/NixOS/nixpkgs/pull/29302#issuecomment-332809092 for more information. This broke image format compatibility and therefore amongst others mesos.
| * | | Revert "dockerTools.buildImage: Switch to the format image generated by Skopeo"Robin Gloster2017-09-28
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 35f205a4b624bceca7c53b9c19ddac5f37a5ae4c. This does not use a standard format and by that breaks mesos
* | | | Merge remote-tracking branch 'upstream/staging' into deps-reorgJohn Ericson2017-09-28
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'master' into stagingVladimír Čunát2017-09-26
| |\| |
| | * | dockerTools.examples.nix: set NIX_PAGER=cat environment variableAntoine Eiche2017-09-25
| | | |
| | * | Merge older stagingVladimír Čunát2017-09-24
| | |\ \ | | | | | | | | | | | | | | | | | | | | Hydra looks OK; not finished yet but already has more successes than on master.
| | * | | dockerTools.buildImage: Switch to the format image generated by SkopeoAntoine Eiche2017-09-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using 'Combined Image JSON + Filesystem Changeset Format' [1] to unpack and pack image and this patch switches to the format used by the registry. We used the 'repository' file which is not generated by Skopeo when it pulls an image. Moreover, all information of this file are also in the manifest.json file. We then use the manifest.json file instead of 'repository' file. Note also the manifest.json file is required to push an image with Skopeo. Fix #29636 [1] https://github.com/moby/moby/blob/749d90e10f989802638ae542daf54257f3bf71f2/image/spec/v1.1.md#combined-image-json--filesystem-changeset-format
| * | | | Merge #29617: cc-wrapper: Use stdenvNoCC to buildVladimír Čunát2017-09-26
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | cc-wrapper: Use stdenvNoCC to buildJohn Ericson2017-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc-wrapper may wrap a cc-compiler, but it doesn't need one to build itself. (c.f. expand-response-params is a separate derivation.) This helps avoid cycles on the cross stuff, in addition to removing a useless dependency edge. I could have been super careful with overrides in the stdenv to avoid the mass rebuild, but I don't think it's worth it.
| * | | | Merge pull request #29580 from obsidiansystems/stdenv-super-debugJohn Ericson2017-09-26
| |\| | | | | |_|/ | |/| | stdenv: Provide a way for full `set -x` debugging
| | * | cc-wrapper: Add `set -x` tracing for NIX_DEBUG >= 7John Ericson2017-09-26
| | | |
| | * | treewide: Use `(( "${NIX_DEBUG:-0}" >= 1) ))` consistentlyJohn Ericson2017-09-26
| | | |
| * | | Merge branch 'master' into stagingVladimír Čunát2017-09-23
| |\ \ \ | | | |/ | | |/| | | | | Thousands of rebuilds from master :-/
| | * | dockerTools.buildImageWithNixDb: Make output paths valid and add gcrootsAntoine Eiche2017-09-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The database dump doesn't contain sha and size. This leads to invalid path in the container. We have to fix the database by using nix-store. Note a better way to do this is available in Nix 1.12 (since the database dump contains all required information). We also add content output paths in the gcroots since they ca be used by the container.
| | * | dockerTools.buildImageWithNixDb: populate the Nix Db of the image Nix storeAntoine Eiche2017-09-20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the contents closure is copied to the layer but there is no nix database initialization. If pkgs.nix is added in the contents, nix-store doesn't work because there is no nix database. From the contents of the layer, this commit generates and loads the database in the nix store of the container. This only works if there is no parent layer that already have a nix store (to support several nix layers, we would have to merge nix databases of parent layers). We also add an example to play with the nix store inside the container. Note it seems `more` is a missing dependency of the nix package!
| * | Merge branch 'master' into stagingJohn Ericson2017-09-20
| |\|
| * | Merge branch 'master' into stagingVladimír Čunát2017-09-19
| |\ \
| * \ \ Merge master-merged PRs #29547 and #29548 into stagingJohn Ericson2017-09-18
| |\ \ \
| * | | | set-source-date-epoch-to-latest.sh: shut up a warningVladimír Čunát2017-09-17
| | | | | | | | | | | | | | | | | | | | | | | | | > bash: warning: command substitution: ignored null byte in input /cc #28227. Also break the overlong line.
* | | | | treewide: Manual fix more pkg-config build-inputsJohn Ericson2017-09-21
| | | | |
* | | | | misc pkgs: Basic sed to get fix `pkgconfig` and `autoreconfHook` `buildInputs`John Ericson2017-09-21
| |_|_|/ |/| | | | | | | | | | | Only acts on one-line dependency lists.
* | | | cc-wrapper, cc-wrapper-old: Simplify shell logicJohn Ericson2017-09-19
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. `crossDrv` is now the default so we don't need to worry about that in build != host builds. 2. shell is the build time shell, so `wrapCCCross` doesn't need to worry, as build == host. 3. `shell.shellPath` will always be appended where useful. 4. Complicated `shell == ""` logic served no purpose.
* | | Merge pull request #29548 from obsidiansystems/cc-wrapper-cross-miscJohn Ericson2017-09-18
|\ \ \ | | |/ | |/| cc-wrapper: Two trivial changes affecting cross compilation
| * | cc-wrapper: Use same dynamic loader on all Darwin, not just x86_64John Ericson2017-09-18
| | | | | | | | | | | | | | | In practice, this is correct because iOS is on ARM and puts the loader there.
| * | cc-wrapper: Remove obsolete assertionJohn Ericson2017-09-18
| |/ | | | | | | This was just causing evaluation problems on cross.
* | fetchRepoProject: Fetch into $out and make it deterministicMichael Weiss2017-09-17
| | | | | | | | | | | | | | | | | | | | | | | | Fetch into $out and remove all version control files to make it deterministic (.repo and all .git subdirectories - e.g. the .git/index files change every time). Additionally I've changed the default of "useArchive" to false because fetching with "--archive" will fail for some projects (e.g. "platform/external/iosched" from the AOSP). Now, this function should hopefully work for every tag of the AOSP.
* | dockerTools.pullImage: use skopeo to pull the imageAntoine Eiche2017-09-17
|/ | | | | | | | | | | | | Before this patch, a VM was used to spawn docker that pulled the VM. Now, the tool Skopeo does this job well so we can simplify our dockerTools since we doesn't need Docker anymore:) This also fixe the regression described in https://github.com/NixOS/nixpkgs/issues/29271 : cntlm proxy doesn't work in 17.09 while it worked in 17.03. Note Skopeo doesn't produce the same output than docker pull so, we have to update sha.
* gitRepo: Fix an error due to missing TLS certificatesMichael Weiss2017-09-16
| | | | | | | | | | | | | | | | This was a problem when run inside a sandbox, e.g. via "fetchRepoProject". The error message from repo seems unrelated: fatal: Cannot get https://gerrit.googlesource.com/git-repo/clone.bundle fatal: error no host given But the exception is actually thrown due to missing certificates (/etc/ssl/certs). It should be possible to provide another location via environment variables (e.g. SSL_CERT_FILE, REQUESTS_CA_BUNDLE or CURL_CA_BUNDLE) but apparently that doesn't actually work for some reason (would have to study our Python packaging). Now "fetchRepoProject" works without the "--no-clone-bundle" option.
* fetchRepoProject: Fix the GnuPG verificationMichael Weiss2017-09-16
| | | | | | | | | | | The verification was failing with the following error: gpg: keyblock resource '/tmp/nix-build-XYZ.drv-0/.repo/repo/./.repoconfig/gnupg/pubring.kbx': No such file or directory Using an absolute path for $HOME fixes this. And since 175ecbab9163fa6d5dc7481c6258301833e02042 the dependencies on "git" and "gnupg" aren't required anymore as "gitRepo" already covers them.
* fetchRepoProject: Refactor the codeMichael Weiss2017-09-16
| | | | Should hopefully make it a bit more readable and less redundant.
* Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2017-09-16
|\
| * Merge pull request #27780 from tilpner/overridable-buildenvFrederik Rietdijk2017-09-14
| |\ | | | | | | Make buildEnv overridable
| | * buildenv: Make buildEnv overridabletilpner2017-08-02
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | vm: remove trusty-updates hash as it changes too oftenDomen Kožar2017-09-14
| | |