max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-24 14:56:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9682 commits 7 branches 0 tags 64 MiB
Commit graph

9682 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eelco Dolstra
8252a44e96 Move to separate file 2020-11-26 13:16:36 +01:00
Eelco Dolstra
9a586e34ac Record trusted/untrusted settings in ~/.local/share/nix 2020-11-26 13:11:07 +01:00
Eelco Dolstra
0287f83057 Ask for confirmation before allowing flake Nix configuration settings 2020-11-26 12:37:23 +01:00
Eelco Dolstra
605bacdc92
Merge pull request #4276 from B4dM4n/macos-sandbox-build 
Fix macOS sandbox build
 2020-11-23 18:00:35 +01:00
Eelco Dolstra
eb6b9bd672
Merge pull request #4275 from lukegb/mercurialHGPLAIN 
fetchMercurial: set HGPLAIN when invoking hg
 2020-11-23 17:59:26 +01:00
Fabian Möller
5b0790355f
Fix macOS sandbox build 
Since c4c3c15c19 (#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-23 17:40:17 +01:00
Luke Granger-Brown
226116f482 fetchMercurial: set HGPLAIN when invoking hg 
Without setting HGPLAIN, the user's environment leaks into
hg invocations, which means that the output may not be in the
expected format.

HGPLAIN is the Mercurial-recommended solution for this in that
it's intended for uses by scripts and programs which are looking
to parse Mercurial's output in a consistent manner.
 2020-11-23 16:12:33 +00:00
Eelco Dolstra
1973669e86
Merge pull request #4271 from wiltaylor/IgnoreReferenceSwitch 
Skip Reference Check on bundler
 2020-11-23 12:48:07 +01:00
Wil Taylor
07603890d2 Removed reference check from bundler command 2020-11-23 21:19:40 +10:00
Eelco Dolstra
7827d95f6c
Merge pull request #4272 from kwohlfahrt/perl-sigs 
Return derivation signatures in Perl bindings
 2020-11-23 10:14:41 +01:00
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
Kai Wohlfahrt
df83b6df68 Return signatures in Perl path info 2020-11-21 22:06:15 +00:00
zimbatm
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
Wil Taylor
c3bad73e27 Added switch 2020-11-21 14:28:49 +10: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