summary refs log tree commit diff
path: root/pkgs/build-support
Commit message (Collapse)AuthorAge
* Merge commit '3ab2949' from staging into masterTuomas Tynkkynen2018-03-15
|\ | | | | | | | | | | Conflicts: pkgs/development/compilers/llvm/6/llvm.nix pkgs/servers/home-assistant/component-packages.nix
| * Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-03-13
| |\ | | | | | | | | | | | | Conflicts: pkgs/development/tools/build-managers/conan/default.nix
| * \ Merge branch 'master' into stagingJan Malakhovski2018-03-10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix
| * | | treewide: Remove gnat support.Shea Levy2018-03-08
| | | | | | | | | | | | | | | | See discussion in https://github.com/NixOS/nixpkgs/commit/6ac7b19c978e951c124c5ea434c94f95f593888e.
| * | | Merge remote-tracking branch 'origin/staging' into cross-nixosShea Levy2018-03-01
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-03-01
| | |\ \ \
| * | | | | makeModulesClosure: Fix cross-compilationShea Levy2018-02-28
| |/ / / /
| * | | | Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-02-28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix
| * \ \ \ \ Merge pull request #35071 from oxij/stdenv/infopagesJohn Ericson2018-02-26
| |\ \ \ \ \ | | | | | | | | | | | | | | stdenv, bash: fixing info pages and stuff
| | * | | | | cc-wrapper: allow building without documentation, propagate info pagesJan Malakhovski2018-02-26
| | | | | | |
| | * | | | | bintools-wrapper: allow building without documentationJan Malakhovski2018-02-26
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into HEADFrederik Rietdijk2018-02-26
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into stagingNikolay Amiantov2018-02-23
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge pull request #36845 from jbedo/singularitylewo2018-03-14
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | singularity: 2.4 -> 2.4.2
| * | | | | | | | singularity: 2.4 -> 2.4.2Justin Bedo2018-03-12
| | | | | | | | |
* | | | | | | | | fetchurl: remove broken samba mirrorFranz Pletz2018-03-13
| | | | | | | | |
* | | | | | | | | dockerTools: add an onTopOfPulledImage exampleAntoine Eiche2018-03-13
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to test if a pulled image can be updated by using our Docker tools.
* | | | | | | | buildFHSEnv: export TZDIRNikolay Amiantov2018-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed since NixOS keeps tzdata in non-standard /etc/zoneinfo path.
* | | | | | | | buildFHSEnv: fix compiler search pathsNikolay Amiantov2018-03-10
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Fixes OpenWrt compilation.
* | | | | | | Merge branch 'patch-10' of git://github.com/matthewbauer/nixpkgsShea Levy2018-03-08
|\ \ \ \ \ \ \
| * | | | | | | nix-buffer: make eshell-path-env be inheritedMatthew Justin Bauer2018-02-15
| | | | | | | |
* | | | | | | | makeInitrd: explain why we don't use closureInfoVladimír Čunát2018-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /cc #36268.
* | | | | | | | Revert "makeInitrd: Use closureInfo"Eelco Dolstra2018-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 776a5e6ebfacc6831527bc6c3c1a58ef2087c819. Fixes #36268.
* | | | | | | | Merge pull request #32248 from awakesecurity/parnell/fetchdockerFranz Pletz2018-03-04
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Support fetching docker images from V2 registries
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into parnell/fetchdockerParnell Springmeyer2018-02-13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into parnell/fetchdockerParnell Springmeyer2018-01-10
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | docker: init fetchdocker nix code for docker2nixParnell Springmeyer2017-12-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds granular, non-docker daemon docker image fetchers and a docker image layer compositor to be used in conjunction with the `docker2nix` utility provided by the `haskellPackages.hocker` package. This change includes a hackage package version bump and updated sha256 for recent fixes released to `hocker` resulting from formulating this patch.
* | | | | | | | | | | Merge branch 'master' into nix-2.0Vladimír Čunát2018-03-03
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | callCabal2nix: Fix filtering for non-cleanSourceable sources.Shea Levy2018-02-28
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | What was here before wasn't correct anyway, and now it works in restricted mode. Fixes #35207
| * | | | | | | | | bintools-wrapper: fix breakage on aarch64, where "isArm" is falseWill Dietz2018-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unintentionally changed in #35247
| * | | | | | | | | Merge pull request #35247 from telent/mips32John Ericson2018-02-27
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | lib, treewide: Add missing MIPS arches, and fix existing usage
| | * | | | | | | | | lib, treewide: Add missing MIPS arches, and fix existing usageDaniel Barlow2018-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existing "mips64el" should be "mipsel". This is just the barest minimum so that nixpkgs can recognize them as systems - although required for building individual derivations onto MIPS boards, it is not sufficient if you want to actually build nixos on those targets
| * | | | | | | | | | Revert "Merge staging at '8d490ca9934d0' into master"Vladimír Čunát2018-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fc232422201c0364dbd57826c9a137cc1239caea, reversing changes made to 754816b84b98afdc0727e13dd66e1698b097de6a. We don't have many binaries yet. Comment on the original merge commit.
| * | | | | | | | | | Merge staging at '8d490ca9934d0c01e1e9ade455657e54e2e843c0' into masterFrederik Rietdijk2018-02-26
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Merge pull request #35266 from abbradar/cc-boolsJohn Ericson2018-02-21
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | cc-wrapper: fix bool handling for empty and zero values
| | | * | | | | | | | cc-wrapper: fix bool handling for empty and zero valuesNikolay Amiantov2018-02-21
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the code would fail silently for zero values and with some output for empties. We now currently handle both via defaulting value to zero and making `let` return success error code when there's no syntax error.
| * | | | | | | | | tree-wide: autorename gnome packages to use dashesJan Tojnar2018-02-25
| | | | | | | | | |
| * | | | | | | | | Merge pull request #35176 from abbradar/update-vmJörg Thalheim2018-02-24
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | vmTools: update distributions
| | * | | | | | | | vmTools: update distributionsNikolay Amiantov2018-02-21
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop currently unsupported releases. Add Fedora 26 and 27. Update CentOS. Add Debian 9. Add Ubuntu 17.10.
| * | | | | | | | build-support/rust: make use of abandoned cargoUpdateHookYurii Rashkovskii2018-02-23
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, cargoUpdateHook was meaningful as it was used in [`cargo-fetch-deps`](https://github.com/NixOS/nixpkgs/blob/19d3cf81d3436a6600f261579b55b9132a6ca8fb/pkgs/build-support/rust/fetch-cargo-deps#L71). However, this entire file was removed in 5f8cf0048ea089fa73d17512fc4f9f0f0644e225. As far as I can tell, nothing in the code is using it, but it is still being passed around: https://github.com/NixOS/nixpkgs/search?q=cargoUpdateHook&type=Code&utf8=%E2%9C%93 There are, however, legitimate use cases for it. For example, in some software, some dependencies are not locked in Cargo.toml and this causes Cargo to try fetching another version of them. This doesn't work well with vendoring crates. This hook allows to inject patching or whatever necessary workarounds in the crate vendoring process. I suppose that's what it was for in there in the first place. This patch restores this hook and makes it usable again.
* | | | | | | | CleanupEelco Dolstra2018-02-27
| | | | | | | |
* | | | | | | | Merge pull request #35402 from shlevy/closure-info-total-sizeEelco Dolstra2018-02-23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | closureInfo: Report the total closure size.
| * | | | | | | | closureInfo: Report the total closure size.Shea Levy2018-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be useful for e.g. preallocating disk image sizes.
* | | | | | | | | makeInitrd: Use closureInfoEelco Dolstra2018-02-23
|/ / / / / / / /
* | | | | | | | Merge remote-tracking branch 'origin/master' into nix-2.0Eelco Dolstra2018-02-22
|\| | | | | | |
| * | | | | | | buildBazelPackage: initNikolay Amiantov2018-02-20
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A separate function for building Bazel-bazed packages. Internally it splits the build into two phases, fetching and building. Users are expected to provide `fetchArgs.sha256` -- checksum of fetched dependencies. Local dependencies should be removed in `fetchArgs.preInstall`. Overall `fetchArgs` and `buildArgs` can be used to add specific steps to fetch and build.
| * | | | | | Merge pull request #35177 from abbradar/fix-debbuildJörg Thalheim2018-02-20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | debBuild: install all packages at once to avoid dependency management
| | * | | | | | debBuild: install all packages at once to avoid dependency managementNikolay Amiantov2018-02-19
| | |/ / / / /
| * | | | | | rust: 1.22.1 -> 1.24.0Jörg Thalheim2018-02-20
| | | | | | |
| * | | | | | BuildRustCrate: more general overrides, and handling the "dylib" crate type ↵Pierre-Etienne Meunier2018-02-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#35171) * buildRustCrate: adding a symlink from libblah-xxxxx.so to libblah.so * BuildRustCrate: overriding phases * Carnix: 0.6.5 -> 0.6.6 * Fixing symlink_dependencies --buildDep * Shorter symlink_dependencies * running `runHook postBuild` *after* the build