about summary refs log tree commit diff
path: root/pkgs/stdenv
AgeCommit message (Collapse)AuthorFilesLines
2021-10-25Merge pull request #137209 from milahu/patch-10Artturi1-2/+2
2021-10-13stdenv: add llvm-config to meson cross fileRick van Schijndel1-0/+3
This is e.g. required to get mesa cross-compiling, but is useful for everyone depending on libllvm
2021-10-07Merge pull request #138289 from sternenseemann/fix-non-gnu-stripsterni1-6/+1
stdenv: move --enable-deterministic-archives flag into GNU wrapper
2021-10-06stdenv: add shopt inherit_errexithappysalada1-0/+1
2021-10-06stdenv: use named ref to clarify intenthappysalada1-11/+10
2021-10-02libxml2: use libiconv on DarwinEmily1-1/+1
This fixes e.g. python3Packages.beautifulsoup4, which has tests relying on the wider encoding support enabled by libiconv. Fixes #137678.
2021-09-23Merge branch 'master' into staging-nextRyan Burns2-1/+7
2021-09-23sigtool: 4a3719b4 -> 2a13539d (#138453)Michael Stone2-1/+7
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-09-18stdenv: move --enable-deterministic-archives flag into GNU wrappersternenseemann1-6/+1
`--enable-deterministic-archives` is a GNU specific strip flag and causes other strip implementations (for example LLVM's, see #138013) to fail. Since strip failures are ignored, this means that stripping doesn't work at all in certain situation (causing unnecessary dependencies etc.). To fix this, no longer pass `--enable-deterministic-archives` unconditionally, but instead add it in a GNU binutils specific strip wrapper only. `commonStripFlags` was only used for this flag, so we can remove it altogether. Future work could be to make a generic strip wrapper, with support for nix-support/strip-flags-{before,after} and NIX_STRIP_FLAGS_{BEFORE,AFTER}. This possibly overkill and unnecessary though -- also with the additional challenge of incorporating the darwin strip wrapper somehow.
2021-09-17stdenv: re-add isMachO helper function (#138334)Winter1-0/+28
2021-09-17Merge #138186: stdenv: remove isMachO helper functionVladimír Čunát1-23/+0
...into staging-next
2021-09-16stdenv: remove isMachO helper functionWinter1-23/+0
This reverts commit 488395c0f80e2863e9cf83ffb029a330c8e19573. Currently, `nix print-dev-env` fails to execute if this function is present, because of its use of hex literals. Until this issue (https://github.com/NixOS/nix/issues/5262) is solved, we should revert this to prevent breakage.
2021-09-12stdenv/setup.sh: fix read -N 0 for bash 5happysalada1-1/+3
somehow `read -N 0` behavior changed in bash 5. `read -d ''` has identical behavior the purpose of the function is to read stdin and exit 1 on a null byte (i.e. if stdin is the content of a binary) (cherry picked from commit 5d0acf20f88b1820cb8b641cfc5a43e973122701)
2021-09-09unpackFile: ignore timestamp warningsmilahu1-2/+2
2021-09-07stdenv: fix nix_build_cores guesshappysalada1-9/+4
- use builtin arithmetic instead of external expr - simplify logic with bash builtins
2021-09-06stdenv: fix showBuildStatshappysalada1-8/+6
- remove going through another file - use builtin instead of external cat - improve echo formatting
2021-09-05Revert "Merge remote-tracking branch 'origin/python-unstable' into staging-next"Martin Weinelt2-65/+57
This reverts commit b041b2e1b25a0ed55d0943030c9da1b5f68ab3c6, reversing changes made to 5b6c2380adb4c4ddb0f87152cef0016333ea5a4d.
2021-08-30stdenv setup.sh: remove combined [ in favor of [[happysalada1-3/+3
[ ... ] && [ ...] -> [[ ... && ... ]]
2021-08-30stdenv: remove bash version compatibility hackhappysalada1-16/+16
2021-08-30stdenv: remove combined command conditionalhappysalada1-9/+11
2021-08-30stdenv: arithmetic fixeshappysalada1-23/+23
2021-08-30stdenv: reduce iohappysalada1-6/+8
2021-08-30stdenv: declare missing variableshappysalada1-0/+4
2021-08-21stdenv: add isMachO helper function (#133808)Sebastián Mancilla1-0/+23
Detect if a binary is a Mach-O file.
2021-08-20pkgsStatic: Finally obviate overlay!John Ericson2-5/+23
2021-08-19pkgsStatic: Inline more of static overlayJohn Ericson1-0/+18
2021-08-18Merge pull request #134463 from Ericson2314/stdenv-adapter-latebindJohn Ericson3-453/+482
stdenv: Fix overriding + `overrideAttrs`
2021-08-18pkgs/stdenv/make-derivation: ReindentJohn Ericson1-395/+396
We previously make it just be the function, not a single-item attrset, without deindenting to make a readable diff. No we deindent.
2021-08-18stdenv: Fix overriding + `overrideAttrs`John Ericson3-59/+87
The old stdenv adapters were subtly wrong in two ways: - `overrideAttrs` leaked the original, unoverridden `mkDerivation`. - `stdenv.override` would throw away any manually-set `mkDerivation` from a stdenv reverting to the original. Now, `mkDerivation` is controlled (nearly directly) via an argument, and always correctly closes over the final ("self") stdenv. This means the adapters can work entirely via `.override` without any manual `stdenv // ...`, and both those issues are fixed. Note hashes are changed, because stdenvs no previously overridden like `stdenvNoCC` and `crossLibcStdenv` now are. I had to add some `dontDisableStatic = true` accordingly. The flip side however is that since the overrides compose, we no longer need to override anything but the default `stdenv` from which all the others are created.
2021-08-07Merge master into staging-nextgithub-actions[bot]1-0/+1
2021-08-07stdenv/check-meta: add maxSilentArtturin1-0/+1
Hydra supports it https://github.com/NixOS/hydra/blob/master/src/hydra-eval-jobs/hydra-eval-jobs.cc#L172
2021-07-27stdenv/setup: force libtool to skip dep checksAlyssa Ross1-0/+1
When we "fix" libtool, we empty out its system library path to avoid it discovering libraries in e.g. /usr when the sandbox is disabled. But this also means that the checks libtool does to make sure it can find the libraries its supposed to be linking to won't work. On Linux and Darwin, this isn't a problem, because libtool doesn't actually perform any checks, but it is on at least NetBSD and Cygwin[1]. So, we force libtool not to do these checks on any platform, bringing the more exotic platforms into line with the existing behaviour on Linux and Darwin. Without this change, lots of library packages produce warnings like this in their build output on the platforms with checks by default: *** Warning: linker path does not have real file for library -lz. *** I have the capability to make that library automatically link in when *** you link to this library. But I can only do this if you have a *** shared version of the library, which you do not appear to have *** because I did check the linker path looking for a file starting *** with libz but no candidates were found. (...for regex pattern test) *** The inter-library dependencies that have been dropped here will be *** automatically added whenever a program is linked with this library *** or is declared to -dlopen it. And dependent packages break because libtool doesn't link their transitive dependencies. So making this change fixes _lots_ of packages on those platforms. [1]: https://git.savannah.gnu.org/cgit/libtool.git/tree/m4/libtool.m4?id=544fc0e2c2a03129a540aebef41ad32bfb5c06b8#n3445
2021-07-23Merge pull request #130601 from happysalada/stdenv_cosmeticJörg Thalheim1-1/+1
Stdenv cosmetic
2021-07-19stdenv: typohappysalada1-1/+1
2021-07-17Revert #127736: stdenv changes towards an alternative shellVladimír Čunát2-149/+113
At least for now. Such changes are risky (we have very many packages), and apparently it needs more testing/review without blocking other changes. This reverts the whole range 4d0e3984918^..8752c327377, except for one commit that got reverted in 6f239d73096 already. (that MR didn't even get its merge commit)
2021-07-16Merge #129854: stdenv/darwin: finalize URLs (into staging-next)Vladimír Čunát1-2/+1
2021-07-16stdenv/make-bootstrap-tools: nuke yet another headerVladimír Čunát1-1/+1
This is needed after glibc bump from PR #111616.
2021-07-16stdenv/darwin: switch to the official bootstrap URLsVladimír Čunát1-2/+1
2021-07-16Merge #129854: stdenv/darwin: update bootstrap toolsVladimír Čunát1-6/+7
... for x86_64-darwin (into staging-next) It wouldn't bootstrap otherwise. Unfortunately we still haven't managed to get the tarballs on the proper URLs, but GitHub should be reliable enough and surely almost noone will bootstrap themselves anyway.
2021-07-16Revert "setup.sh: fatal: This word should yield a string, but it contains an ↵Vladimír Čunát1-7/+10
array" This reverts commit bf99a819a16089a8df03cc06262f06b31dfb683c. It caused regressions in some packages; see: https://github.com/NixOS/nixpkgs/commit/bf99a819a160
2021-07-10stdenv/darwin: update bootstrap tools for x86_64-darwinVladimír Čunát1-6/+7
Updated python3 will block bootstrapping otherwise. Verification instructions: $ xdg-open https://hydra.nixos.org/build/144118577#tabs-details $ nix build /nix/store/sh9cd0rarr8a2db1zdr4fzl4qsmvz5jp-stdenv-bootstrap-tools $ cat /nix/store/sh9cd0rarr8a2db1zdr4fzl4qsmvz5jp-stdenv-bootstrap-tools/nix-support/hydra-build-products $ nix hash-path /nix/store/9h4d7s313wv3gkfwi493yr1wvdsz9lf2-stdenv-bootstrap-tools/on-server/{sh,bzip2,mkdir,cpio} sha256-igMAVEfumFv/LUNTGfNi2nSehgTNIP4Sg+f3L7u6SMA= sha256-K3rhkJZipudT1Jgh+l41Y/fNsMkrPtiAsNRDha/lpZI= sha256-VddFELwLDJGNADKB1fWwWPBtIAlEUgJv2hXRmC4NEeM= sha256-SWkwvLaFyV44kLKL2nx720SvcL4ej/p2V/bX3uqAGO0= $ nix hash-file /nix/store/9h4d7s313wv3gkfwi493yr1wvdsz9lf2-stdenv-bootstrap-tools/on-server/bootstrap-tools.cpio.bz2 sha256-b65dXbIm6o6s6U8tAiGpR6SMfvfn/VFcZgTHBetJZis=
2021-07-06Merge branch 'glibc-2.33' into stagingVladimír Čunát1-0/+19
2021-07-06stdenv bootstrap: hack around glibc version mismatchVladimír Čunát1-0/+19
With this we shouldn't need other workarounds for the LTO problems.
2021-07-06Update pkgs/stdenv/generic/setup.sh:use [[ instead of [Raphael Megzari1-1/+1
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-06Update pkgs/stdenv/generic/setup.sh: use [[ instead of [Raphael Megzari1-1/+1
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-06Update pkgs/stdenv/generic/setup.sh: group var declarationRaphael Megzari1-2/+1
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-06Update pkgs/stdenv/generic/setup.sh: group var declarationRaphael Megzari1-2/+1
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-06setup.sh: separate command from combined conditionalhappysalada1-9/+11
2021-07-06Update pkgs/stdenv/generic/setup.shRaphael Megzari1-1/+1
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-07-06setup.sh: remove bash empty array old hackhappysalada1-15/+15
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-14 03:59:40 +0000