Eelco Dolstra
dd77f71afe
LocalBinaryCacheStore::upsertFile(): Fix race
...
When multiple threads try to upsert the same file, this could fail.
Fixes #4667 .
2021-03-26 17:10:15 +01:00
Eelco Dolstra
4638bcfb2c
Fix some typos
...
Fixes #4671 .
2021-03-26 16:14:38 +01:00
Domen Kožar
dc6a8f1548
Merge pull request #4532 from abathur/macos_nixbld_ids
...
fix nixbld user name/uid for macOS/darwin
2021-03-25 10:35:56 +01:00
Eelco Dolstra
d1cb956bf2
Merge pull request #4650 from samueldr/fix/registry-config-dir
...
Use the appropriate config dir for the registry
2021-03-24 13:37:19 +01:00
Eelco Dolstra
4e2c206adb
Merge pull request #4663 from Stig124/stig124-1
...
Added Debian-based OS's profiles
2021-03-24 13:36:17 +01:00
Nicolas Stig124 FORMICHELLA
71f92741ec
Added Debian-based OS's profiles
2021-03-23 16:23:24 +01:00
Eelco Dolstra
1581c3e8ef
Merge pull request #4603 from DavHau/davhau-improve-nix-conf-help-builders
...
improve man page for nix.conf (builders)
2021-03-23 16:13:02 +01:00
Eelco Dolstra
6749d9e057
Merge pull request #4646 from Ma27/support-scoped-v6
...
Fix Nix to properly work with stores using a scoped IPv6 address
2021-03-23 15:03:47 +01:00
Eelco Dolstra
61bb1e2ffc
Merge pull request #4657 from obsidiansystems/build-result-marshalling-cleanup-lighter
...
Fix typos in the last PR #4656
2021-03-23 15:02:05 +01:00
DavHau
0f40561c78
nix.conf builders: refer to manual page
2021-03-23 10:19:00 +07:00
John Ericson
f44206e719
Fix typos in the last PR #4656
2021-03-22 15:18:48 +00:00
Eelco Dolstra
e2e66e3f7f
Merge pull request #4656 from obsidiansystems/build-result-marshalling-cleanup-lighter
...
Clean up serialization for `BuildResult`
2021-03-22 16:08:57 +01:00
John Ericson
9d309de0de
Clean up serialization for BuildResult
...
A few versioning mistakes were corrected:
- In 27b5747ca7
, Daemon protocol had some
version `>= 0xc` that should have been `>= 0x1c`, or `28` since the
other conditions used decimal.
- In a2b69660a9
, legacy SSH gated new CAS
info on version 6, but version 5 in the server. It is now 6
everywhere.
Additionally, legacy ssh was sending over more metadata than the daemon
one was. The daemon now sends that data too.
CC @regnat
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2021-03-22 14:57:41 +00:00
Samuel Dionne-Riel
66b857244f
Use the appropriate config dir for the registry
2021-03-19 15:20:47 -04:00
Samuel Dionne-Riel
bf07581497
tests: Test .config
stays clean with XDG_CONFIG_HOME set
2021-03-19 15:20:47 -04:00
Samuel Dionne-Riel
1765711b68
tests/config: Fix config test configuration
...
First, "XDG_CONFIG_HOME" shouldn't be named "home", as it may be
confusing compared with `$HOME`, which an upcoming test will be using.
Then, using a fixed location for the test is problematic. Use
`$TEST_ROOT` instead.
2021-03-19 15:20:47 -04:00
Eelco Dolstra
3e0e443181
ProgressBar: Respect verbosity level
...
This makes its behaviour consistent with SimpleLogger.
2021-03-19 17:56:39 +01:00
Eelco Dolstra
ef83ced4e1
Restore 'nix flake info' as a deprecated alias
2021-03-19 17:21:37 +01:00
Eelco Dolstra
8a5203d3b8
Merge pull request #4648 from hercules-ci/remove-unimplemented-hashAlgoOpt
...
Remove unimplemented hashAlgoOpt
2021-03-17 20:51:09 +01:00
Robert Hensing
a61112aadf
Remove unimplemented hashAlgoOpt
...
It was in the header but never implemented.
2021-03-17 11:27:11 +01:00
Maximilian Bosch
ddcef3bcbb
Fix Nix to properly work with stores using a scoped IPv6 address
...
According to RFC4007[1], IPv6 addresses can have a so-called zone_id
separated from the actual address with `%` as delimiter. In contrast to
Nix 2.3, the version on `master` doesn't recognize it as such:
$ nix ping-store --store ssh://root@fe80::1%18 --experimental-features nix-command
warning: 'ping-store' is a deprecated alias for 'store ping'
error: --- Error ----------------------------------------------------------------- nix
don't know how to open Nix store 'ssh://root@fe80::1%18'
I modified the IPv6 match-regex accordingly to optionally detect this
part of the address. As we don't seem to do anything special with it, I
decided to leave it as part of the URL for now.
Fixes #4490
[1] https://tools.ietf.org/html/rfc4007
2021-03-16 19:14:42 +01:00
Eelco Dolstra
66fa1c7375
Merge 'nix flake {info,list-inputs}' into 'nix flake metadata'
...
Fixes #4613 .
2021-03-16 17:19:04 +01:00
Eelco Dolstra
77f5d171e1
--override-input: Imply --no-write-lock-file
...
Fixes #3779 .
2021-03-16 16:53:39 +01:00
regnat
5ec873b127
Shorten the test drv name
...
To prevent the OSX build to fail because of a too long socket path
2021-03-16 16:44:42 +01:00
regnat
be60c9ef50
Fix the db-migration test
2021-03-16 14:21:41 +01:00
regnat
81df1b5c68
Remove the remote-store-old-daemon
test
...
Doesn't make sense anymore with the new setup
2021-03-16 14:21:40 +01:00
regnat
a0866c8ea4
Make the tests (optionnally) run in another derivation
...
That way we can run them without rebuilding Nix
2021-03-16 14:21:39 +01:00
regnat
eab9cdbd75
Add a test for the migration of the db between versions
2021-03-16 14:20:41 +01:00
regnat
5716345adf
Add a test ensuring compatibility with an old daemon
...
This requires adding `nix` to its own closure which is a bit unfortunate,
but as it is optional (the test will be disabled if `OUTER_NIX` is unset) it
shouldn't be too much of an issue.
(Ideally this should go in another derivation so that we can build Nix and run
the test independently, but as the tests are running in the same derivation
as the build it's a bit complicated to do so).
2021-03-16 14:20:41 +01:00
Eelco Dolstra
338f271058
Merge pull request #4644 from NixOS/fix-test.mk-syntax-error
...
tests/local.mk: fix missing newline escape
2021-03-16 10:18:38 +01:00
sternenseemann
5869b3025d
tests/local.mk: fix missing newline escape
...
Fixes syntax error introduced in 54ced9072b
.
2021-03-16 08:25:04 +01:00
Eelco Dolstra
ccb8a403ee
Merge pull request #4587 from obsidiansystems/derivation-goal-detect-invalid-output
...
Throw error for derivation goal with bogus wanted output
2021-03-15 16:49:44 +01:00
Eelco Dolstra
c0073f6268
Merge pull request #4580 from obsidiansystems/restore-test-build-remote-ca-fixed
...
Restore now-working build-remote-content-addressed-fixed test
2021-03-15 16:48:28 +01:00
Eelco Dolstra
91ea9c52ee
Merge pull request #4624 from NixOS/ca/realisation-nix-command
...
Add a `nix realisation` command for working on realisations
2021-03-15 16:37:09 +01:00
Eelco Dolstra
a5e21aa13c
Merge pull request #4618 from NixOS/ca/sign-drvoutputs
...
Sign the derivation outputs
2021-03-15 16:35:41 +01:00
regnat
703c98c6cb
Properly sign the unresolved drvs
...
Don't let them inherit the signature from the parent one (because it
makes no sense to do so), but re-sign them after they have been built
2021-03-15 16:35:17 +01:00
regnat
54ced9072b
Check the signatures when copying store paths around
...
Broken atm
2021-03-15 16:35:14 +01:00
regnat
3e6017f911
pathInfoIsTrusted -> pathInfoIsUntrusted
...
I guess the rationale behind the old name wath that
`pathInfoIsTrusted(info)` returns `true` iff we would need to `blindly`
trust the path (because it has no valid signature and `requireSigs` is
set), but I find it to be a really confusing footgun because it's quite
natural to give it the opposite meaning.
2021-03-15 16:34:49 +01:00
regnat
826877cabf
Add some logic for signing realisations
...
Not exposed anywhere, but built realisations are now signed (and this
should be forwarded when copy-ing them around)
2021-03-15 16:34:49 +01:00
Eelco Dolstra
306c154632
Merge pull request #4592 from NixOS/ca/remote-cache
...
Substitute content-addressed derivations
2021-03-15 16:22:42 +01:00
Travis A. Everett
0431cf6d09
fix nixbld user name/uid for macOS
2021-03-11 10:16:34 -06:00
Domen Kožar
8127094f76
Merge pull request #4577 from abathur/simplify_install_tests
...
simplify changing cachix cache for install tests
2021-03-11 15:32:13 +00:00
Eelco Dolstra
3bb1becdbb
Merge pull request #4566 from orbekk/master
...
Add support for bare git repositories when using git+file
2021-03-11 10:38:07 +01:00
Yorick van Pelt
8a0c00b856
Use libarchive for all compression
2021-03-10 22:34:29 +01:00
regnat
89013bdd7e
Add a nix realisation
command for working on realisations
...
Currently only has `nix realisation info`, more to come probably
2021-03-09 10:16:44 +01:00
Eelco Dolstra
1c0e3e453d
Merge pull request #4601 from lovesegfault/fix-4598
...
nix-build: check that envCommand exists
2021-03-08 10:13:39 +01:00
Eelco Dolstra
8ce2045ecc
Merge pull request #4614 from abathur/patch-1
...
remove doc for obsolete --no-build-hook flag
2021-03-08 10:07:17 +01:00
Eelco Dolstra
c5a232dda7
Merge pull request #4615 from NixOS/nix-show-stats-with-nix-cmd
...
Make NIX_SHOW_STATS work with new-style commands
2021-03-08 09:56:59 +01:00
Travis A. Everett
ac8ba2eae4
remove doc for obsolete --no-build-hook flag
...
`--no-build-hook` appears to have been removed in 25f32625e2
2021-03-06 19:51:29 -06:00
Eelco Dolstra
52b6e0f837
Merge pull request #4606 from obsidiansystems/avoid-stringify-store-path
...
Avoid some StorePath -> Path -> StorePath roundtrips
2021-03-05 11:18:14 +01:00