summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* {bintools,cc}-wrapper: Fix setup hook to respect the role of the cc-compilerJohn Ericson2017-12-30
| | | | | | | We now have the information to properly determine the role the cc-wrapper dependency has, by taking advantage of `offset`. No longer use the soon-to-be-deprecated crossConfig environment variable, the temp hack used before this change.
* stdenv: Fix handling of dependencies and hooksJohn Ericson2017-12-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4 far-reaching changes: Smaller PATH, New vars, different propagation logic, and different hook logic Smaller PATH ------------ `buildInputs` no longer go on the PATH at build time, as they cannot be run when cross compiling and we don't want to special case. Simply make a `nativeBuildInput` too if one needs them on the PATH. Fixes #21191. Many new depedendency variables ------------------------------- See the stdenv chapter of the nixpkgs manual. I pulled out the existing documentation of dependency specification into a new section, and added language for these two (and their propagated equivalents) along side the others'. More complex propagation logic ------------------------------ Before a propagated*XXX*Input always acted as if it was specified directly as a *XXX*Input downstream. That's simple enough, but violates the intended roles of each sort of dep, which has functional and not just stylistic consequences. The new algorithm is detailed in the manual, and ensures everything ends up in the right place. I tried to give both an informal and formal description, but I suspect in practice it will not make much sense until one tries cross compiling, after which it will immediately make sense as the only sane option. Simplified hook logic --------------------- Rather than `envHook` and `crossEnvHook`, whose behavior differs depending on whether we are cross compiling or not, there is now one hook per sort (or rather non-propagated and propagated pair of sorts) of dependency. These new hooks have the same meaning regardless of cross compilation. See the setup hook section of stdenv chapter of the Nixpkgs manual for more details.
* top-level: Splice in more package sets for new types of depsJohn Ericson2017-12-30
| | | | | This is done in preparation for the next commit where, among other changes, I add support for the new `dep*` attributes.
* Merge branch 'bintools-release-note' into ericson2314-cross-baseJohn Ericson2017-12-30
|\
| * doc: Breaking change release note for bintools-wrapperJohn Ericson2017-12-30
| |
* | boost: Clean, reducing duplicationJohn Ericson2017-12-30
| | | | | | | | | | | | This was motivated originally by my cross work, but that goal requires a few more commits to other things. Still, it's good to start the cleanup now / get things out of the way.
* | bintools-wrapper: Define fallback default emulationJohn Ericson2017-12-29
| | | | | | | | This ensures we by-default cross-compile to the intended platform.
* | stdenv cross adapter: Get rid of extra propagatation of buildInputsJohn Ericson2017-12-29
| | | | | | | | Binutils is patched so we don't rely on `--rpath-link`.
* | binutils: Always search DT_RPATHBen Gamari2017-12-29
| |
* | kmime, colord-kde: ki18n should be *run*-time dependencyJohn Ericson2017-12-29
| | | | | | | | | | It is gettext-based, but is a library for run time, relying on the normal gettext tools at build time.
* | libelf: Fix cross compilationJohn Ericson2017-12-29
| | | | | | | | | | | | | | | | | | There is an upstream bug where it is assumed that if host != build, host doesn't support shared libraries. We override that overly conservative check. See http://lists.uclibc.org/pipermail/uclibc-cvs/2005-August/019383.html Also clean up some comments.
* | diffutils: Enable cross-compilationBen Gamari2017-12-29
| |
* | gawk: Enable cross-compilationBen Gamari2017-12-29
| |
* | Merge branch 'mingw32-w64-fix' into ericson2314-cross-baseJohn Ericson2017-12-29
|\ \
| * \ Merge commit '3afe325a3e2f906ba512fb7a2f28f79496711592' into mingw32-w64-fixJohn Ericson2017-12-29
| |\ \
| * \ \ Merge commit 'e82bd498d1a2a28fb20249569a6f49fcaab9aca8' into mingw32-w64-fixJohn Ericson2017-12-29
| |\ \ \
| * \ \ \ Merge commit '3a59cd87f26cc59c91fb821749b1ec0d64922f87' into mingw32-w64-fixJohn Ericson2017-12-29
| |\ \ \ \
| * | | | | mingw-w64: Disable stack hardening of the runtimeBojan Nikolic2017-12-29
| | | | | | | | | | | | | | | | | | | | | | | | Do this because it is built with the static stage
| * | | | | Merge commit '51948eab9415fde1825dea5c7d31b99b2e1a0fdb' into mingw32-w64-fixJohn Ericson2017-12-29
| |\ \ \ \ \
| * | | | | | gcc: Enable SSP and shared libs in the final stage for MinGWBojan Nikolic2017-12-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hardening on by default now that we don't use the cross wrapper. In turn, hardening requires libssp in particular.
* | | | | | | Merge branch 'alt-stdenv' into ericson2314-cross-baseJohn Ericson2017-12-27
|\ \ \ \ \ \ \
| * | | | | | | treewide: Cleanup usage of multi-arch toolsJohn Ericson2017-12-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't needlessly force GCC - Prefer using multi-arch stdenvs to using multi-arch tools directly.
| * | | | | | | top level: Clean up definitions of alternative stdenvsJohn Ericson2017-12-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Dispatch off more appropriate conditions---`stdenv.cc.is*` and `hostPlatform.is*` directly---rather than the OS as a proxy. - Don't worry about pulling in binutils from normal `stdenv.cc` for `gccMultiStdenv`. - Defining a `multiStdenv` that uses whatever compiler is default. - Define `stdenv_32bit` in terms of `multiStdenv`.
| * | | | | | | top level: Stop hacking around #28223John Ericson2017-12-26
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Clang stdenvs with either libc++ should work now.
* | | | | | | darwin stdenv: Make stdenv.cc, not stdenv, bring in libcxxJohn Ericson2017-12-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stdenvNoCC should not inject any C++ standard library, just as it doesn't inject any C standard library. stdenv still does, but only indirectly through stdenv.cc. Wrapped clangs can be simplified now that they don't need to worry about clobbering CoreFoundation when replacing the C++ standard library implementation. This generally-good cleanup should assist with debugging some C++ failures in #26805.
* | | | | | | buildPythonPackage: Make setup hook part of nativeBuildInputsJohn Ericson2017-12-21
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This is better organization in general, but also needed to make python work with #26805.
* | | | | | Merge branch 'staging'Vladimír Čunát2017-12-19
|\ \ \ \ \ \
| * | | | | | perlPackages: use ld-is-cc-hook to fix buildOrivej Desh2017-12-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after #29396 removed `-L path/to/dir/of/libstdc++.so` from ld flags See https://github.com/NixOS/nixpkgs/pull/29396#issuecomment-352600129 Module::Build build helper works correctly when LD is unset (taking LD from Perl config to be `cc`). However, we can not unset LD because this goes contrary to the cross compilation effort, and we can not make it propagate ld-is-cc-hook because it breaks e.g. the build of `libguestfs`. However, #29396 makes LD=ld incompatible with just 3 perl packages; they are individually fixed by this commit.
| * | | | | | ld-is-cc-hook: initOrivej Desh2017-12-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hook sets LD to CC, for use with software that works as if LD=$CC when LD is unset, and does not work when LD=ld.
| * | | | | | makeSetupHook: make the default name "hook" overridableOrivej Desh2017-12-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for occasional convenience while looking at drv paths, such as in the output of nix-build and nix-diff.
| * | | | | | Revert "cairo: bugfix 1.14.10 -> 1.14.12"Orivej Desh2017-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fc5756ea5e4a73624e0cfbb0e3eef247fc312547. It hangs in cairo_image_surface_create_from_png_stream consuming 100% CPU when png is malformed: https://github.com/NixOS/nixpkgs/commit/fc5756ea5e4a73624e0cfbb0e3eef247fc312547
| * | | | | | mpv: fix build with libva 2Orivej Desh2017-12-18
| | | | | | |
| * | | | | | gst_all_1.gst-vaapi: 1.12.3 -> 1.12.4Orivej Desh2017-12-18
| | | | | | |
| * | | | | | Merge branch 'master' into stagingOrivej Desh2017-12-18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (125 commits) scummvm: fix eval tinycc: 0.9.27pre-20171016 -> 0.9.27 Update terraform provider versions vscode: 1.18.1 -> 1.19.0 linux: 4.14.6 -> 4.14.7 scummvm: 1.9.0 -> 2.0.0 cmst: 2017.03.18 -> 2017.09.19 albert: 0.14.7 -> 0.14.14 obs-studio: fix vlc plugin ffmpeg, ffmpeg-full: 3.4 -> 3.4.1 uchiwa: 0.26.3 -> 1.1.0 linux-testing: 4.15-rc3 -> 4.15-rc4 steam: override nss, nspr, fixes #32781 ponyc: 0.20.0 -> 0.21.0 pythonPackages.pwntools: disable tests gnome3.gnome-tweak-tool: 3.26.3 → 3.26.4 vim-rhubarb: init at 2017-06-28 atom: depend on libsecret nvidia-settings: Make sure binary can find libXv.so backblaze-b2: 0.6.2 -> 1.1.0 ...
| * \ \ \ \ \ \ Merge pull request #32725 from yegortimoshenko/fribidiOrivej Desh2017-12-18
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fribidi: update source
| | * | | | | | | fribidi: update sourceYegor Timoshenko2017-12-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old site redirects to GitHub.
| * | | | | | | | cairo: bugfix 1.14.10 -> 1.14.12Vladimír Čunát2017-12-16
| | | | | | | | |
| * | | | | | | | mesa: maintenance 17.2.6 -> 17.2.7Vladimír Čunát2017-12-16
| | | | | | | | |
| * | | | | | | | libjpeg(-turbo): 1.5.2 -> 1.5.3Vladimír Čunát2017-12-16
| | | | | | | | |
| * | | | | | | | Merge #32686: update nodejs and libuvVladimír Čunát2017-12-16
| |\ \ \ \ \ \ \ \
| | * | | | | | | | libuv: 1.16.1 -> 0.18.0Bob van der Linden2017-12-14
| | | | | | | | | |
| | * | | | | | | | nodejs: 9.2.0 -> 9.3.0Bob van der Linden2017-12-14
| | | | | | | | | |
| * | | | | | | | | biber: remove sed workaroundGabriel Ebner2017-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was fixed by #32717.
| * | | | | | | | | Merge pull request #32717 from gebner/perl-builder-env-perlOrivej Desh2017-12-16
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | perl generic builder: recognize #!/usr/bin/env perl
| | * | | | | | | | perl generic builder: recognize #!/usr/bin/env perlGabriel Ebner2017-12-15
| | | | | | | | | |
| * | | | | | | | | Revert "Reverting #32599"Vladimír Čunát2017-12-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 15d3d68a5ea819dd82784a9a44cfe26ed5eb74cd. The PR is moved from master to staging.
| * | | | | | | | | Merge branch 'master' into stagingVladimír Čunát2017-12-15
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into stagingVladimír Čunát2017-12-15
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #32660 from jtojnar/mesonOrivej Desh2017-12-14
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | meson: 0.43.0 → 0.44.0
| | * | | | | | | | | | meson: 0.43.0 → 0.44.0Jan Tojnar2017-12-14
| |/ / / / / / / / / /
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-08 06:08:20 +0000