arcuru/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
9670 commits 22 branches 2 tags 65 MiB
Commit graph

9670 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra 56599bd282
Merge pull request #4224 from zimbatm/per-build-installer 
installer: simplify the per-build installation
 2020-11-22 00:06:23 +01:00
Jonas Chevalier 233b61d3d6
installer: simplify the per-build installation 
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-21 19:56:46 +01:00
Eelco Dolstra 4dcb183af3 AttrCursor::getStringWithContext(): Force re-evaluation if the cached context is not valid 
Fixes #4236.
 2020-11-19 20:59:36 +01:00
Eelco Dolstra 0327580e54 Fix assertion failure in LockFile::LockFile() 
Fixes #4241.
 2020-11-19 20:31:30 +01:00
Eelco Dolstra bc4df3394d
Merge pull request #4269 from obsidiansystems/sync-hash-derivation-modulo-cache 
Make drv hash modulo memo table thread-safe
 2020-11-19 20:03:06 +01:00
John Ericson 2113ae2d85 Make drv hash modulo memo table thread-safe 
Let's get one step closer to the daemon not needing to fork.
 2020-11-19 16:50:06 +00:00
Eelco Dolstra 79aa7d9518
Merge pull request #4268 from DavHau/patch-1 
fix typo in comment in fetchurl.nix
 2020-11-18 17:03:45 +01:00
DavHau 0fa6d380b2
fix typo in comment in fetchurl.nix 2020-11-18 11:20:50 +07:00
Eelco Dolstra ae3191666f
Merge pull request #4171 from YorikSar/zsh-nix-profiles 
Fix iterating over $NIX_PROFILES in Zsh
 2020-11-17 15:53:44 +01:00
Eelco Dolstra 4dbd05e933
Merge pull request #4189 from edolstra/flake-config 
Allow nix.conf options to be set in flake.nix
 2020-11-17 15:39:14 +01:00
Eelco Dolstra f89fd0bde7 Remove stray debug statement 
This was causing a failure on macOS.

https://hydra.nixos.org/build/130354318
 2020-11-17 15:36:20 +01:00
Eelco Dolstra 3daa256728 Remove tests.binaryTarball 
This test no longer works on Hydra because import-from-derivation is
no longer allowed.
 2020-11-17 15:26:39 +01:00
Eelco Dolstra f4e790cc85
Merge pull request #4182 from mkenigs/fix-1930 
Print built derivations as json for build
 2020-11-17 14:59:49 +01:00
Eelco Dolstra df5c69a94e
Merge pull request #4180 from Ma27/ssh-ng-substitute 
Allow substituting paths when building remotely using `ssh-ng://`
 2020-11-17 14:01:04 +01:00
Eelco Dolstra e6b7c7b79c Cleanup 2020-11-17 13:58:55 +01:00
Eelco Dolstra bccff827dc Fix deadlock in IFD through the daemon 
Fixes #4235.
 2020-11-17 13:50:36 +01:00
Eelco Dolstra 5160ceef30
Merge pull request #4266 from tweag/better-sql-error-messages 
Make the sql debug statements more useful
 2020-11-17 11:35:39 +01:00
regnat 7de21f6664 Make the sql debug statements more useful 
Print the expanded sql query (with the variables bound to their value) rather
than the original one in case of error
 2020-11-17 10:05:45 +01:00
Eelco Dolstra ef84c780bb
filterANSIEscapes(): Handle UTF-8 characters 2020-11-16 16:41:53 +01:00
Eelco Dolstra 0d6419ad87
Merge pull request #4262 from jbaum98/master 
Fix deadlock in nix-store when max-connections=1
 2020-11-16 10:20:36 +01:00
Eelco Dolstra 399c7f3f8b
Merge pull request #4257 from hercules-ci/issue-4197-nix-build-output-order 
Issue 4197 nix build output order
 2020-11-16 10:15:28 +01:00
Jake Waksbaum 01db455733 Fix deadlock in nix-store when max-connections=1 
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-16 02:35:50 -05:00
Robert Hensing d264da8d96 tests: Test #4197 nix-build output order regression 2020-11-13 17:50:04 +01:00
Robert Hensing ac5081d280 nix-build: Fix #4197 output order regression 2020-11-13 17:49:27 +01:00
Eelco Dolstra 258e5338d6
Merge pull request #4251 from serokell/mkaito/ops1098-nix-default-nix-path 
Fix default nix-path
 2020-11-12 17:45:19 +01:00
Christian Höppner c4c3c15c19 Fix default nix-path 
The default nix-path values for nixpkgs and root channels were
incorrect.
 2020-11-12 15:46:08 +00:00
Matthew Kenigsberg d52b12c0a5 Test nix build --json 2020-11-11 10:27:02 -06:00
Matthew Kenigsberg 8abb80a478 Print built derivations as json for build 
Add --json option to nix build to allow machine readable output on
stdout with all built derivations

Fixes #1930
 2020-11-11 10:27:02 -06:00
Eelco Dolstra 905f6678e8
Merge pull request #4243 from abathur/fix_4058 
enable Darwin.arm64 to install x86_64 binary
 2020-11-10 23:33:17 +01:00
Eelco Dolstra 4badb6943f Fix use of dirty Git/Mercurial inputs with chroot stores 
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-10 23:22:45 +01:00
Travis A. Everett 4864df6d6b enable Darwin.arm64 to install x86_64 binary 
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-10 08:48:49 -06:00
Eelco Dolstra cdc840d60b
Merge pull request #4242 from wizeman/fix-stack-overflow 
Fix stack overflow introduced in #4206
 2020-11-10 11:51:00 +01:00
Eelco Dolstra 3f680c1dcc
Merge pull request #4233 from Kha/master 
nix develop: Preserve stdin with `-c`
 2020-11-10 10:51:48 +01:00
Ricardo M. Correia 108a2dab7e Fix stack overflow introduced in #4206 2020-11-10 04:25:24 +01:00
dependabot[bot] 0ed7c957be
Bump cachix/install-nix-action from v11 to v12 (#4237) 
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-09 23:21:55 +00:00
Sebastian Ullrich 3f24a417da Add test case for incidentally fixed #4228 2020-11-09 22:43:14 +01:00
Sebastian Ullrich 579b953231 Make test case more precise 
Co-authored-by: Théophane Hufschmitt <regnat@users.noreply.github.com>
 2020-11-09 22:43:14 +01:00
Sebastian Ullrich fb7735e4cf nix develop: Preserve stdin with -c 2020-11-09 22:43:14 +01:00
Eelco Dolstra b87f84cf55
Fix appending to Setting<StringSet> 
Fixes: warning: unknown setting 'extra-sandbox-paths'
 2020-11-09 15:04:34 +01:00
Maximilian Bosch 3a63fc6cd5
Allow substituting paths when building remotely using ssh-ng:// 
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-05 20:12:37 +01:00
Eelco Dolstra 387f824cab
Merge pull request #4206 from hercules-ci/fix-coroutine-gc 
Fix memory corruption caused by GC-invisible coroutine stacks
 2020-11-05 10:18:31 +01:00
Eelco Dolstra 5e6eabe155 Fix error message 'assertion failed at' 2020-11-03 14:45:24 +01:00
Eelco Dolstra e8c379555f LocalStore: Get rid of recursive_mutex 2020-11-03 14:45:24 +01:00
Eelco Dolstra 797a52e31d Add FIXME 2020-11-03 14:45:24 +01:00
Domen Kožar cf82e14712
Merge pull request #4214 from grahamc/test-nix-copy-closure 
nix-copy-closure: verify it works with drvs
 2020-11-03 11:45:56 +01:00
Graham Christensen 8cd2ff69c3
nix-copy-closure: verify it works with drvs 
Creates test coverage for #4210 and 7cf874c17d
 2020-11-02 15:50:14 -05:00
Eelco Dolstra 550e11f077 nix repl: Fix handling of multi-line expressions 2020-11-02 19:07:37 +01:00
Eelco Dolstra 7cf874c17d Don't use readDerivation() in addValidPath() 
readDerivation() requires a valid path.

Fixes #4210.
 2020-11-02 18:46:44 +01:00
mkenigs 8b15650e74
docs: consistent console prompt (#4213) 
Everywhere else a $ is used
 2020-11-02 16:32:05 +01:00
Eelco Dolstra ab2ef851b6
Merge pull request #4207 from hercules-ci/fix-RemoteStore-filterSource-deadlock 
Fix RemoteStore pool deadlock in filterSource etc
 2020-11-02 14:46:10 +01:00