aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-23Fix macOS sandbox buildFabian Möller
Since c4c3c15c19bc448a4797e5d9577539cc14890618 (#4251) building Nix for macOS with sandboxing fails: ``` getting status of /nix/var/nix/profiles/per-user/root/channels/nixpkgs: Operation not permitted ``` This happens, because `EvalSettings::getDefaultNixPath` tries to access paths outside the sandbox. Since the state-dir is not required for doc generation, it is set to the dummy folder. This needs to be done for all nix invocations during doc generation, as `EvalSettings::getDefaultNixPath` is called unconditionally.
2020-11-23Merge pull request #4271 from wiltaylor/IgnoreReferenceSwitchEelco Dolstra
Skip Reference Check on bundler
2020-11-23Removed reference check from bundler commandWil Taylor
2020-11-23Merge pull request #4272 from kwohlfahrt/perl-sigsEelco Dolstra
Return derivation signatures in Perl bindings
2020-11-22Merge pull request #4224 from zimbatm/per-build-installerEelco Dolstra
installer: simplify the per-build installation
2020-11-21Return signatures in Perl path infoKai Wohlfahrt
2020-11-21installer: simplify the per-build installationzimbatm
The goal is to allow the installation and testing of arbitrary Nix versions. Extend the base installer to accept a `--tarball-url-prefix <url>` to change where the Nix tarball is getting downloaded from. Once this is merged it should allow to: 1. Pick an evaluation at https://hydra.nixos.org/jobset/nix/master that looks healthy 2. Select the installedScript build and find the store path. Now equipped with all of this, use an instance of nar-serve to fetch the install script and release tarballs: curl -sfL https://nar-serve.numtide.com/nix/store/rkv4yh7pym941bhj0849zqdkg2546bdv-installer-script/install \ | sh --tarball-url-prefix https://nar-serve.numtide.com/nix/store Or with cachix, strip the /nix/store and derivation name and then: curl -sfL https://mycache.cachix.org/serve/rkv4yh7pym941bhj0849zqdkg2546bdv/install \ | sh --tarball-url-prefix https://mycache.cachix.org/serve Fixes #4047
2020-11-21Added switchWil Taylor
2020-11-19AttrCursor::getStringWithContext(): Force re-evaluation if the cached ↵Eelco Dolstra
context is not valid Fixes #4236.
2020-11-19Fix assertion failure in LockFile::LockFile()Eelco Dolstra
Fixes #4241.
2020-11-19Merge pull request #4269 from obsidiansystems/sync-hash-derivation-modulo-cacheEelco Dolstra
Make drv hash modulo memo table thread-safe
2020-11-19Make drv hash modulo memo table thread-safeJohn Ericson
Let's get one step closer to the daemon not needing to fork.
2020-11-18Merge pull request #4268 from DavHau/patch-1Eelco Dolstra
fix typo in comment in fetchurl.nix
2020-11-18fix typo in comment in fetchurl.nixDavHau
2020-11-17Merge pull request #4171 from YorikSar/zsh-nix-profilesEelco Dolstra
Fix iterating over $NIX_PROFILES in Zsh
2020-11-17Merge pull request #4189 from edolstra/flake-configEelco Dolstra
Allow nix.conf options to be set in flake.nix
2020-11-17Remove stray debug statementEelco Dolstra
This was causing a failure on macOS. https://hydra.nixos.org/build/130354318
2020-11-17Remove tests.binaryTarballEelco Dolstra
This test no longer works on Hydra because import-from-derivation is no longer allowed.
2020-11-17Merge pull request #4182 from mkenigs/fix-1930Eelco Dolstra
Print built derivations as json for build
2020-11-17Merge pull request #4180 from Ma27/ssh-ng-substituteEelco Dolstra
Allow substituting paths when building remotely using `ssh-ng://`
2020-11-17CleanupEelco Dolstra
2020-11-17Fix deadlock in IFD through the daemonEelco Dolstra
Fixes #4235.
2020-11-17Merge pull request #4266 from tweag/better-sql-error-messagesEelco Dolstra
Make the sql debug statements more useful
2020-11-17Make the sql debug statements more usefulregnat
Print the expanded sql query (with the variables bound to their value) rather than the original one in case of error
2020-11-16filterANSIEscapes(): Handle UTF-8 charactersEelco Dolstra
2020-11-16Merge pull request #4262 from jbaum98/masterEelco Dolstra
Fix deadlock in nix-store when max-connections=1
2020-11-16Merge pull request #4257 from hercules-ci/issue-4197-nix-build-output-orderEelco Dolstra
Issue 4197 nix build output order
2020-11-16Fix deadlock in nix-store when max-connections=1Jake Waksbaum
This fixes a bug I encountered where `nix-store -qR` will deadlock when the `--include-outputs` flag is passed and `max-connections=1`. The deadlock occurs because `RemoteStore::queryDerivationOutputs` takes the only connection from the connection pool and uses it to check the daemon version. If the version is new enough, it calls `Store::queryDerivationOutputs`, which eventually calls `RemoteStore::queryPartialDerivationOutputMap`, where we take another connection from the connection pool to check the version again. Because we still haven't released the connection from the caller, this waits for a connection to be available, causing a deadlock. This diff solves the issue by using `getProtocol` to check the protocol version in the caller `RemoteStore::queryDerivationOutputs`, which immediately frees the connection back to the pool before returning the protocol version. That way we've already freed the connection by the time we call `RemoteStore::queryPartialDerivationOutputMap`.
2020-11-13tests: Test #4197 nix-build output order regressionRobert Hensing
2020-11-13nix-build: Fix #4197 output order regressionRobert Hensing
2020-11-12Merge pull request #4251 from serokell/mkaito/ops1098-nix-default-nix-pathEelco Dolstra
Fix default nix-path
2020-11-12Fix default nix-pathChristian Höppner
The default nix-path values for nixpkgs and root channels were incorrect.
2020-11-11Test nix build --jsonMatthew Kenigsberg
2020-11-11Print built derivations as json for buildMatthew Kenigsberg
Add --json option to nix build to allow machine readable output on stdout with all built derivations Fixes #1930
2020-11-10Merge pull request #4243 from abathur/fix_4058Eelco Dolstra
enable Darwin.arm64 to install x86_64 binary
2020-11-10Fix use of dirty Git/Mercurial inputs with chroot storesEelco Dolstra
Fixes: $ nix build --store /tmp/nix /home/eelco/Dev/patchelf#hydraJobs.build.x86_64-linux warning: Git tree '/home/eelco/Dev/patchelf' is dirty error: --- RestrictedPathError ------------------------------------------------------------------------------------------- nix access to path '/tmp/nix/nix/store/xmkvfmffk7xfnazykb5kx999aika8an4-source/flake.nix' is forbidden in restricted mode (use '--show-trace' to show detailed location information)
2020-11-10enable Darwin.arm64 to install x86_64 binaryTravis A. Everett
Throwing @thefloweringash under the bus if this doesn't work, but it sounds like Apple Silicon devices can use the x86_64 binary for now. Fixes #4058
2020-11-10Merge pull request #4242 from wizeman/fix-stack-overflowEelco Dolstra
Fix stack overflow introduced in #4206
2020-11-10Merge pull request #4233 from Kha/masterEelco Dolstra
nix develop: Preserve stdin with `-c`
2020-11-10Fix stack overflow introduced in #4206Ricardo M. Correia
2020-11-09Bump cachix/install-nix-action from v11 to v12 (#4237)dependabot[bot]
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from v11 to v12. - [Release notes](https://github.com/cachix/install-nix-action/releases) - [Commits](https://github.com/cachix/install-nix-action/compare/v11...07da2520eebede906fbeefa9dd0a2b635323909d) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-09Add test case for incidentally fixed #4228Sebastian Ullrich
2020-11-09Make test case more preciseSebastian Ullrich
Co-authored-by: Théophane Hufschmitt <regnat@users.noreply.github.com>
2020-11-09nix develop: Preserve stdin with `-c`Sebastian Ullrich
2020-11-09Fix appending to Setting<StringSet>Eelco Dolstra
Fixes: warning: unknown setting 'extra-sandbox-paths'
2020-11-05Allow substituting paths when building remotely using `ssh-ng://`Maximilian Bosch
Until now, it was not possible to substitute missing paths from e.g. `https://cache.nixos.org` on a remote server when building on it using the new `ssh-ng` protocol. This is because every store implementation except legacy `ssh://` ignores the substitution flag passed to `Store::queryValidPaths` while the `legacy-ssh-store` substitutes the remote store using `cmdQueryValidPaths` when the remote store is opened with `nix-store --serve`. This patch slightly modifies the daemon protocol to allow passing an integer value suggesting whether to substitute missing paths during `wopQueryValidPaths`. To implement this on the daemon-side, the substitution logic from `nix-store --serve` has been moved into a protected method named `Store::substitutePaths` which gets currently called from `LocalStore::queryValidPaths` and `Store::queryValidPaths` if `maybeSubstitute` is `true`. Fixes #2770
2020-11-05Merge pull request #4206 from hercules-ci/fix-coroutine-gcEelco Dolstra
Fix memory corruption caused by GC-invisible coroutine stacks
2020-11-03Fix error message 'assertion failed at'Eelco Dolstra
2020-11-03LocalStore: Get rid of recursive_mutexEelco Dolstra
2020-11-03Add FIXMEEelco Dolstra