aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-09-07WIP: broken merge but need a git checkpointGuillaume Maudoux
2022-09-06Merge pull request #6995 from matthewbauer/disable-sa-restart-on-macosEelco Dolstra
Disable SA_RESTART for some signals on macOS
2022-09-06Remove some signalsMatthew Bauer
2022-09-06Merge pull request #7002 from tweag/reset-timestamps-in-installerEelco Dolstra
Installer: Reset the timestamps in the tarball
2022-09-05Merge pull request #6980 from virusdave/patch-1Théophane Hufschmitt
Set `HOME` var to `root`'s home when running `nix-store` as `root`
2022-09-05Installer: Reset the timestamps in the tarballThéophane Hufschmitt
Otherwise it isn't reproducible. Fix https://github.com/NixOS/nix/issues/7001
2022-09-05Merge pull request #6993 from matthewbauer/dont-read-derivation-in-goalThéophane Hufschmitt
Don’t readDerivation if impure derivations feature is disabled
2022-09-03Add more signalsMatthew Bauer
2022-09-03Disable SA_RESTART for some signals on macOSMatthew Bauer
Disables the SA_RESTART behavior on macOS which causes: > Restarting of pending calls is requested by setting the SA_RESTART bit > in sa_flags. The affected system calls include read(2), write(2), > sendto(2), recvfrom(2), sendmsg(2) and recvmsg(2) on a communications > channel or a slow device (such as a terminal, but not a regular file) > and during a wait(2) or ioctl(2). From: https://man.openbsd.org/sigaction#SA_RESTART This being set on macOS caused a bug where read() calls to the daemon socket were blocking after a SIGINT was received. As a result, checkInterrupt was never reached even though the signal was received by the signal handler thread. On Linux, SA_RESTART is disabled by default. This probably effects other BSDs but I don’t have the ability to test it there right now.
2022-09-02Merge pull request #6990 from matthewbauer/no-space-in-zshEelco Dolstra
Don’t add a space after attrs completion in zsh
2022-09-02Don’t readDerivation if impure derivations feature is disabledMatthew Bauer
readDerivation is pretty slow, and while it may not be significant for some use cases, on things like ghc-nix where we have thousands of derivations is really slows things down. So, this just doesn’t do the impure derivation check if the impure derivation experimental feature is disabled. Perhaps we could cache the result of isPure() and keep the check, but this is a quick fix to for the slowdown introduced with impure derivations features in 2.8.0.
2022-09-02Apply suggestions from code reviewMatthew Bauer
2022-09-02Merge pull request #6987 from ↵Eelco Dolstra
matthewbauer/update-boehmgc-coroutine-sp-fallback-for-darwin Update boehmgc-coroutine-sp-fallback.diff for darwin
2022-09-01Don’t add a space after attrs completion in zshMatthew Bauer
This matches the behavior of bash. We don’t want to add a space after completion on attrs. Uses -S. Switches to new compadd style comppletions instead of _describe. Shouldn’t have any negative issues from what I can tell.
2022-09-01Update boehmgc-coroutine-sp-fallback.diff for darwinMatthew Bauer
The darwin_stop_world implementation is slightly different. sp goes to altstack_lo instead of lo in this case. Assuming that is an implementation detail. But the fix is the same, when we detect alstack_lo outside of the expected stack range, we reset it to hi - stack_limit. Here stack_limit is calculated with pthread_get_stacksize_np since that is the BSD equivalent to pthread_attr_getstacksize.
2022-09-01Merge pull request #6983 from edolstra/revert-6621Eelco Dolstra
Revert "Merge pull request #6621 from Kha/nested-follows"
2022-09-01Revert "Merge pull request #6621 from Kha/nested-follows"Eelco Dolstra
This reverts commit c530cda345377370c52a616d608de88b9d67cd40, reversing changes made to 4adcdff5c1d5f9f135c4ec61d690890443c19e6a.
2022-09-01Merge pull request #6621 from Kha/nested-followsThéophane Hufschmitt
Fix nested flake input overrides
2022-08-31Merge pull request #6973 from Enzime/skip-docker-pushRok Garbas
Only push Docker image when Docker secrets are set
2022-08-31Set `HOME` var to `root`'s home when running `nix-store` as `root`Dave Nicponski
A [recent-ish change](https://github.com/NixOS/nix/pull/6676) logs a warning when a potentially counterintuitive situation happens. This now causes the multi-user installer to [emit a warning](https://github.com/NixOS/nixpkgs/issues/189043) when it's doing the "seed the Nix database" step via a low-level `nix-store --load-db` invocation. `nix-store` functionality implementations don't actually use profiles or channels or homedir as far as i can tell. So why are we hitting this code at all? Well, the current command approach for functionality here builds a [fat `nix` binary](https://github.com/NixOS/nix/blob/master/src/nix/local.mk#L23-L26) which has _all_ the functionality of previous individual binaries (nix-env, nix-store, etc) bundled in, then [uses the invocation name](https://github.com/NixOS/nix/blob/master/src/nix/main.cc#L274-L277) to select the set of commands to expose. `nix` itself has this behavior, even when just trying to parse the (sub)command and arguments: ``` dave @ davembp2 $ nix error: no subcommand specified Try 'nix --help' for more information. dave @ davembp2 $ sudo nix warning: $HOME ('/Users/dave') is not owned by you, falling back to the one defined in the 'passwd' file error: no subcommand specified Try 'nix --help' for more information. dave @ davembp2 $ HOME=~root sudo nix error: no subcommand specified Try 'nix --help' for more information. ``` This behavior can also be seen pretty easily with an arbitrary `nix-store` invocation: ``` dave @ davembp2 $ nix-store --realize dave @ davembp2 $ sudo nix-store --realize # what installer is doing now warning: $HOME ('/Users/dave') is not owned by you, falling back to the one defined in the 'passwd' file dave @ davembp2 $ sudo HOME=~root nix-store --realize # what this PR effectively does dave @ davembp2 $ ```
2022-08-29Only push Docker image when Docker secrets are setMichael Hoang
2022-08-29Merge pull request #6972 from sashashura/patch-1Eelco Dolstra
GitHub Workflows security hardening
2022-08-29Merge pull request #6968 from fricklerhandwerk/man-no-weblinksEelco Dolstra
do not render relative links in help pages
2022-08-28Update backport.ymlAlex
2022-08-28Fix overlapping flake followsSebastian Ullrich
2022-08-28Fix nested flake input overridesSebastian Ullrich
2022-08-26do not render relative links in help pagesValentin Gagarin
this simplifies the setup a lot, and avoids weird looking `./file.md` links showing up. it also does not show regular URLs any more. currently the command reference only has few of them, and not showing them in the offline documentation is hopefully not a big deal. instead of building more special-case solutions, clumsily preprocessing the input, or issuing verbal rules on dealing with URLs, should better be solved sustainably by not rendering relative links in `lowdown`: https://github.com/kristapsdz/lowdown/issues/105
2022-08-26Merge pull request #6954 from winterqt/darwin-sandbox-trustdEelco Dolstra
fix(libstore): allow access to trustd on macOS
2022-08-25Merge pull request #6961 from edolstra/bump-versionEelco Dolstra
Bump version
2022-08-25Bump versionEelco Dolstra
2022-08-24Merge pull request #6959 from edolstra/prepare-releaseEelco Dolstra
Prepare release
2022-08-24Merge pull request #6958 from edolstra/fix-progress-bar-flickerEelco Dolstra
Fix progress bar flicker with -L
2022-08-24Branch 2.11 release notesEelco Dolstra
2022-08-24Bump versionEelco Dolstra
2022-08-24Fix progress bar flicker with -LEelco Dolstra
This was caused by -L calling setLogFormat() again, which caused the creation of a new progress bar without destroying the old one. So we had two progress bars clobbering each other. We should change 'logger' to be a smart pointer, but I'll do that in a future PR. Fixes #6931.
2022-08-24Merge pull request #6956 from edolstra/fix-eval-cacheEelco Dolstra
Fix evaluation cache
2022-08-24Fix evaluation cacheEelco Dolstra
98e361ad4c1a26d4ffe4762a6f33bb9e39321a39 introduced a regression where previously stored attributes were replaced by placeholders. As a result, a command like 'nix build nixpkgs#hello' had to be executed at least twice to get caching. This code does not seem necessary for suggestions to work.
2022-08-24fix(libstore): allow access to trustd on macOSWinter
2022-08-24Merge pull request #6612 from NixOS/parallel-nix-copyEelco Dolstra
Make nix copy parallel again
2022-08-24Remove redundant FinallyEelco Dolstra
2022-08-24Fix macOS buildEelco Dolstra
2022-08-24Merge pull request #6945 from jsoref/nix-setup-tweakEelco Dolstra
darwin-install: fix shell hint
2022-08-24Merge pull request #6946 from rickynils/fix_serve_protocol_version_checkEelco Dolstra
Fix a misplaced parenthese in serve protocol check
2022-08-24Fix a misplaced parenthese in serve protocol checkRickard Nilsson
This issue made it impossible for clients using a serve protocol of version <= 2.3 to use the `cmdBuildDerivation` command of servers using a protocol of version >= 2.6. The faulty version check makes the server send back build outputs that the client is not expecting.
2022-08-23darwin-install: fix shell hintJosh Soref
2022-08-23Merge pull request #6944 from edolstra/bash-varsEelco Dolstra
nix develop: Ignore some more bash special variables
2022-08-23Merge pull request #6909 from ncfavier/json-pathsEelco Dolstra
JSON: print paths as strings without copying them to the store
2022-08-23nix develop: Ignore some more bash special variablesEelco Dolstra
Fixes #6940.
2022-08-23Merge pull request #6902 from centromere/optional-nixpkgsEelco Dolstra
docker.nix: Provide boolean for whether to bundle nixpkgs
2022-08-23Merge pull request #6887 from winterqt/specify-bashinteractive-outputsEelco Dolstra
nix-shell: specify which outputs from bashInteractive to build