summary refs log tree commit diff
path: root/pkgs/stdenv
Commit message (Collapse)AuthorAge
* Revert #127736: stdenv changes towards an alternative shellVladimír Čunát2021-07-17
| | | | | | | | | | 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)
* Merge #129854: stdenv/darwin: finalize URLs (into staging-next)Vladimír Čunát2021-07-16
|\
| * stdenv/darwin: switch to the official bootstrap URLsVladimír Čunát2021-07-16
| |
* | stdenv/make-bootstrap-tools: nuke yet another headerVladimír Čunát2021-07-16
|/ | | | This is needed after glibc bump from PR #111616.
* Merge #129854: stdenv/darwin: update bootstrap toolsVladimír Čunát2021-07-16
|\ | | | | | | | | | | | | | | | | ... 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.
| * stdenv/darwin: update bootstrap tools for x86_64-darwinVladimír Čunát2021-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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=
* | Revert "setup.sh: fatal: This word should yield a string, but it contains an ↵Vladimír Čunát2021-07-16
|/ | | | | | | | array" This reverts commit bf99a819a16089a8df03cc06262f06b31dfb683c. It caused regressions in some packages; see: https://github.com/NixOS/nixpkgs/commit/bf99a819a160
* Merge branch 'glibc-2.33' into stagingVladimír Čunát2021-07-06
|\
| * stdenv bootstrap: hack around glibc version mismatchVladimír Čunát2021-07-06
| | | | | | | | With this we shouldn't need other workarounds for the LTO problems.
* | Update pkgs/stdenv/generic/setup.sh:use [[ instead of [Raphael Megzari2021-07-06
| | | | | | Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
* | Update pkgs/stdenv/generic/setup.sh: use [[ instead of [Raphael Megzari2021-07-06
| | | | | | Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
* | Update pkgs/stdenv/generic/setup.sh: group var declarationRaphael Megzari2021-07-06
| | | | | | Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
* | Update pkgs/stdenv/generic/setup.sh: group var declarationRaphael Megzari2021-07-06
| | | | | | Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
* | setup.sh: separate command from combined conditionalhappysalada2021-07-06
| |
* | Update pkgs/stdenv/generic/setup.shRaphael Megzari2021-07-06
| | | | | | Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
* | setup.sh: remove bash empty array old hackhappysalada2021-07-06
| |
* | setup.sh: use [[ for combined conditionalshappysalada2021-07-06
| |
* | setup.sh: remove extraneous cat cmdhappysalada2021-07-06
| |
* | setup.sh: arithmetic conditional stylehappysalada2021-07-06
| | | | | | | | used "recommended" arithmetic conditional style
* | setup.sh: fatal: Undefined variablehappysalada2021-07-06
| | | | | | | | define hook arrays before assigning to them
* | setup.sh: fatal: This word should yield a string, but it contains an arrayhappysalada2021-07-06
| | | | | | | | remove implicit array comparison in case
* | setup.sh: shellcheck disable=SC1091happysalada2021-07-06
| | | | | | | | https://github.com/koalaman/shellcheck/wiki/SC1091
* | setup.sh: shellcheck disable=SC2034happysalada2021-07-06
| | | | | | | | https://github.com/koalaman/shellcheck/wiki/SC2034
* | setup.sh: missing white spacehappysalada2021-07-06
| |
* | setup.sh: add quotes where semantically validhappysalada2021-07-06
| |
* | setup.sh: fatal: Invalid integer constant 'relHostOffset'happysalada2021-07-06
| | | | | | | | dereference variables passed to mapOffset
* | setup.sh: shellcheck disable=SC2123happysalada2021-07-06
| | | | | | | | https://github.com/koalaman/shellcheck/wiki/SC2123
* | setup.sh: shellcheck disable=SC1090happysalada2021-07-06
| | | | | | | | https://github.com/koalaman/shellcheck/wiki/SC1090
* | shellcheck disable=SC2148happysalada2021-07-06
| | | | | | | | https://github.com/koalaman/shellcheck/wiki/SC2148
* | shellcheck disable=SC2154happysalada2021-07-06
| | | | | | | | https://github.com/koalaman/shellcheck/wiki/SC2154
* | setup.sh: replace type -p with test -ehappysalada2021-07-06
| | | | | | | | | | type -p will exit 1 on failure. Test makes the intent clearer here.
* | setup.sh: arithmetic fixeshappysalada2021-07-06
| | | | | | | | | | | | this one is a little more controversial see https://github.com/oilshell/oil/issues/864 for more information
* | setup.sh: shellcheck 2206 + 2207happysalada2021-07-06
| | | | | | | | | | | | | | https://github.com/koalaman/shellcheck/wiki/SC2206 https://github.com/koalaman/shellcheck/wiki/SC2207 admittedly this one is a lot less pretty
* | setup.sh: shellcheck 2086happysalada2021-07-06
| | | | | | | | https://github.com/koalaman/shellcheck/wiki/SC2086
* | builder.sh: check if variable is non nullhappysalada2021-07-06
| | | | | | | | | | | | | | This is not the "correct" way to check if a variable is non null in bash. There is already an instance of the "right" way to do it in setup.sh. Bash is "generous" enough to accept the original input though. I couldn't find the relevant shellcheck.
* | builder.sh: shellcheck 2129happysalada2021-07-06
| | | | | | | | https://github.com/koalaman/shellcheck/wiki/SC2129
* | builder.sh: shellcheck 2086happysalada2021-07-06
| | | | | | | | https://github.com/koalaman/shellcheck/wiki/SC2086
* | Merge pull request #129328 from nh2/manual-fix-hardening-flags-sectionsNiklas Hambüchen2021-07-05
|\ \ | |/ |/| manual: hardening: Fix disabled flags prose being in previous section
| * manual: hardening: Fix disabled flags prose being in previous sectionNiklas Hambüchen2021-07-05
| | | | | | | | | | | | | | | | | | | | | | This confused the hell out of me, as I didn't spot the > The following flags are disabled by default ... when reading about `pie`, because that sentence was hidden in the previous hardening flag's section. Also explain that `pie` hardening is on by default on musl.
* | Merge pull request #108102 from matthewbauer/bash-version-checkSandro2021-06-24
|\ \ | |/ |/| stdenv/setup.sh: Add version check to setup script
| * stdenv/setup.sh: Add version check to setup scriptMatthew Bauer2021-06-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only bash 4+ works in setup.sh. To make sure this is obvious, we can check BASH_VERSINFO to get the major version number of Bash. While Bash 3 is pretty rare, it still comes stock in macOS. We *could* provide a warning here for non-Bash shells, but it’s not always clear whether they will work or not. Zsh should have no trouble while busybox sh, fish, or any others. There’s no great way to detect what feature set the shell supports. Fixes #71625
* | Merge branch 'staging-next' into stagingJan Tojnar2021-06-16
|\ \ | | | | | | | | | Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
| * | darwin: expose bootstrapLlvmVersion as argument in the stdenvDaiderd Jordan2021-06-13
| | | | | | | | | | | | | | | | | | This enables the bootstrap stdenv test to specify the actual llvm of the newly generated build instread of assuming it's the same version as the current stdenv.
* | | stdenv: introduce dontAddStaticConfigureFlagsAlyssa Ross2021-06-11
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With removeUnknownConfigureFlags, it's impossible to express a package that needs --enable-static, but will not accept --disable-shared, without overriding the result of removeUnknownConfigureFlags _again_ in pkgs/top-level/static.nix. It would be much better (and more in line with the rest of Nixpkgs) if we encoded changes needed for static builds in package definitions themselves, rather than in an ever-expanding list in static.nix. This is especially true when doing it in static.nix is going to require multiple overrides to express what could be expressed with stdenv options. So as a step in that direction, and to fix the problem described above, here I replace removeUnknownConfigureFlags with a new stdenv option, dontAddStaticConfigureFlags. With this mechanism, a package that needs one but not both of the flags just needs to set dontAddStaticConfigureFlags and then set up configureFlags manually based on stdenv.hostPlatform.isStatic.
* | Merge pull request #121055 from toonn/bootstrap-tools-bumpDaiderd Jordan2021-06-09
|\ \ | | | | | | darwin bootstrap-tools bump LLVM to 11
| * | bootstrap-tools: libclang-cpp already includedtoonn2021-06-06
| | | | | | | | | | | | | | | | | | Changes to llvmPackages have caused the `libclang-cpp*.dylib` files to be included in the `clang-unwrapped.lib` output. So we no longer need to copy them from libclang.
| * | bootstrap-tools: Patch TargetConditionals.htoonn2021-06-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `TargetConditionals.h` was missing several definitions, like `TARGET_OS_TV` that are part of SDK 10.12 at least. And one that doesn't seem to occur in any SDK afaict, `TARGET_OS_EMBEDDED_OTHER`. I added the definitions from SDK 10.12 verbatim and defined `TARGET_OS_EMBEDDED_OTHER` to be equal to `0`. This is a modified version of a patch to avoid a stdenv rebuild.
| * | bootstrap-tools: Include libclang-cpp.11.1.dylib tootoonn2021-06-05
| | | | | | | | | | | | | | | We need to include the library with the version suffix because `libclang-cpp.dylib` is just a symlink.
| * | bootstrap-tools: Include libclang-cpp.dylibtoonn2021-06-05
| | | | | | | | | | | | | | | Credits to @LnL7, this is based on commit ae68f1c447d775e64d6e16a33f2affe591c419bf from PR #85151.
| * | bootstrap-tools: Update to LLVM 11toonn2021-06-05
| | |
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-05-25 11:36:25 +0000