Maximilian Bosch
bb1a851bcf
build: also throw hash-mismatch errors if buildMode == bmCheck
...
This actually bit me quite recently in `nixpkgs` because I assumed that
`nix-build --check` would also error out if hashes don't match anymore[1]
and so I wrongly assumed that I couldn't reproduce the mismatch error.
The fix is rather simple, during the output registration a so-called
`delayedException` is instantiated e.g. if a FOD hash-mismatch occurs.
However, in case of `nix-build --check` (or `--rebuild` in case of `nix
build`), the code-path where this exception is thrown will never be
reached.
By adding that check to the if-clause that causes an early exit in case
of `bmCheck`, the issue is gone. Also added a (previously failing)
test-case to demonstrate the problem.
[1] https://github.com/NixOS/nixpkgs/pull/139238 , the underlying issue
was that `nix-prefetch-git` returns different hashes than `fetchgit`
because the latter one fetches submodules by default.
2021-09-27 15:44:39 +02:00
Eelco Dolstra
a0bb5c4130
Merge pull request #4573 from oxalica/fix/git-init-spam
...
Explicitly set default branch name for git to suppress "git hint"
2021-09-24 17:17:04 +02:00
oxalica
81b8e910a0
Explicitly set initial branch name for git
2021-09-24 22:09:49 +08:00
Eelco Dolstra
362d8f925e
Merge pull request #5253 from edolstra/flake-ifd
...
Don't allow IFD in flakes by default
2021-09-24 10:48:23 +02:00
Eelco Dolstra
87de086e1a
Merge pull request #5290 from edolstra/ssh-nologin
...
SSHStore / LegacySSHStore: Show better error if the remote's stdout is polluted
2021-09-23 23:14:30 +02:00
Eelco Dolstra
ea9df6fe51
Shut down write side before draining the read side
...
This is important if the remote side *does* execute
nix-store/nix-daemon successfully, but stdout is polluted
(e.g. because the remote user's bashrc script prints something to
stdout). In that case we have to shutdown the write side to force the
remote nix process to exit.
2021-09-23 18:01:04 +02:00
Eelco Dolstra
994348e9e0
SSHStore / LegacySSHStore: Show a better error message if the remote is "nologin"
...
Instead of
error: serialised integer 7161674624452356180 is too large for type 'j'
we now get
error: 'nix-store --serve' protocol mismatch from 'sshtest@localhost', got 'This account is currently not available.'
Fixes https://github.com/NixOS/nixpkgs/issues/37287 .
2021-09-23 17:50:29 +02:00
Eelco Dolstra
60642aa5e2
Remove risky char *
2021-09-23 12:07:50 +02:00
Eelco Dolstra
198fa786a1
Add some more instrumentation
2021-09-23 11:42:33 +02:00
Eelco Dolstra
1359c2c19a
Merge pull request #5284 from edolstra/revert-4922
...
Revert "Merge pull request #4922 from nrdxp/default-submodules"
2021-09-23 11:13:10 +02:00
Eelco Dolstra
d1bf7431bb
Revert "Merge pull request #4922 from nrdxp/default-submodules"
...
This reverts commit 6678e9841190b2dd570c
2021-09-22 17:25:25 +02:00
Eelco Dolstra
8623a5b595
Disable IFD selectively
...
It's now disabled by default for the following:
* 'nix search' (this was already implied by read-only mode)
* 'nix flake show'
* 'nix flake check', but only on the hydraJobs output
2021-09-22 17:15:07 +02:00
Eelco Dolstra
d8c10028d9
Make setDefault() typed
2021-09-22 14:15:35 +02:00
Eelco Dolstra
8fdb1d057a
Quiet
2021-09-22 14:12:31 +02:00
Eelco Dolstra
ff28fffce2
Don't cache realiseContext() errors
...
Errors that depend on the configuration (such as whether
allow-import-from-derivation is set) should not be cached.
2021-09-22 14:00:56 +02:00
Eelco Dolstra
bcd73ebf60
Add missing #include
...
Fixes #5282 .
2021-09-22 12:14:50 +02:00
Eelco Dolstra
3c1cd09109
Merge pull request #5281 from abathur/install_macos_monterey
...
fix install on macOS monterey
2021-09-22 10:58:02 +02:00
Travis A. Everett
033081aec2
fix install on macOS monterey
2021-09-21 13:38:29 -05:00
Eelco Dolstra
c81f9761cc
Merge pull request #5279 from edolstra/restrict-path-inputs
...
Fix relative path input handling
2021-09-21 14:52:30 +02:00
Eelco Dolstra
60cc975d22
Set input parent at construction time
2021-09-21 14:07:16 +02:00
Eelco Dolstra
06557299b3
Allow relative paths anywhere into the parent's store path
2021-09-21 13:45:11 +02:00
Eelco Dolstra
5cbb9c5406
path fetcher: Fix relative path check
2021-09-21 13:19:26 +02:00
Eelco Dolstra
be69a98d2c
Merge pull request #5277 from NixOS/regnat/ci-better-cache-usage
...
flake: Use the real nixUnstable from nixpkgs
2021-09-20 15:48:32 +02:00
regnat
81ed6ee201
flake: Use the real nixUnstable from nixpkgs
...
Don’t let it pick our overriden lowdown as that would cause it not to be
cached in cache.nixos.org
2021-09-20 14:37:09 +02:00
Eelco Dolstra
2933d3c588
Merge pull request #5266 from gkleen/fix/s3-cache-scheme
...
Fix scheme query parameter for s3 cache
2021-09-20 12:16:53 +02:00
Gregor Kleen
fd67a0f927
Fix scheme argument to s3 cache
2021-09-17 10:45:19 +02:00
Eelco Dolstra
37cc50f2c8
Merge pull request #5263 from greedy/fix-5261
...
Include subpath in flake fingerprint
2021-09-17 08:10:47 +02:00
Geoff Reedy
cbe9ddfd1a
Include subpath in flake fingerprint
...
Without this, flakes within the same tree and same lock data will have
the same fingerprint and the eval cache for one flake will be
incorrectly used for another.
2021-09-16 15:58:21 -06:00
Eelco Dolstra
1ec4efa6c8
Merge pull request #5257 from edolstra/dirty-lock-file
...
If we can't write a lock file, pretend the top-level flake is dirty
2021-09-15 20:18:23 +02:00
Eelco Dolstra
c17f3c5e69
Merge branch 'mh/fix-chroot-eval' of https://github.com/obsidiansystems/nix
2021-09-15 18:37:58 +02:00
Eelco Dolstra
027344ce7e
If we can't write a lock file, pretend the top-level flake is dirty
...
Alternative to #4639 . You can still read flake.lock, but at least in
reproducible workflows like NixOS configurations where you require a
non-dirty tree, evaluation will fail because there is no rev.
2021-09-15 18:31:42 +02:00
Eelco Dolstra
991cc53386
Revert "Disallow reading flake.lock"
...
This reverts commit e5596113f7
2021-09-15 18:30:37 +02:00
Eelco Dolstra
d2c8eed344
Merge pull request #5251 from emilazy/darwin-sandbox-rosetta-2
...
sandbox: allow Rosetta 2 on Darwin
2021-09-15 09:11:26 +02:00
Emily
56025ad3b1
sandbox: allow Rosetta 2 on Darwin
...
This allows sandboxed x86_64-darwin builds on aarch64-darwin.
2021-09-15 02:02:03 +01:00
Eelco Dolstra
fda4efff87
Rename unnecessary git@
2021-09-14 22:53:31 +02:00
Eelco Dolstra
5ee3ee1a6b
Merge pull request #5249 from edolstra/nix-profile
...
Add missing 'nix profile' subcommands
2021-09-14 22:27:19 +02:00
Eelco Dolstra
2c751c0c00
Merge pull request #5250 from edolstra/censor-flake-lock
...
Disallow reading flake.lock
2021-09-14 22:27:02 +02:00
Eelco Dolstra
e5596113f7
Disallow reading flake.lock
...
With --no-write-lock-file, it's possible that flake.lock is out of
sync with the actual inputs used by the evaluation. So doing fromJSON
(readFile ./flake.lock) will give wrong results.
Fixes #4639 .
2021-09-14 21:09:11 +02:00
Eelco Dolstra
b41968f15a
nix profile history: Show profile date
2021-09-14 20:47:33 +02:00
Eelco Dolstra
4b738fc7a9
Add 'nix profile wipe-history' command
2021-09-14 20:35:41 +02:00
Eelco Dolstra
f359b9981b
Generations -> profile versions
2021-09-14 19:57:45 +02:00
Eelco Dolstra
229ad612b8
Fix quotes
2021-09-14 19:48:16 +02:00
Eelco Dolstra
817562e694
Add "nix profile rollback" command
2021-09-14 19:32:33 +02:00
Eelco Dolstra
1fbaf36729
nix flake show --json: Add type info
...
For extensibility, every leaf node is now an object that contains at
least a type field (e.g. "type": "derivation").
2021-09-14 17:18:29 +02:00
Eelco Dolstra
f3259af73e
Merge branch 'tomberek/show_json' of https://github.com/tomberek/nix
2021-09-14 16:58:35 +02:00
Domen Kožar
275cb44f9f
Merge pull request #5242 from NixOS/dependabot/github_actions/cachix/install-nix-action-14
...
Bump cachix/install-nix-action from 13 to 14
2021-09-14 16:04:18 +02:00
Eelco Dolstra
d589a6aa8a
Merge pull request #5247 from edolstra/stablize-ca-references
...
Remove the 'ca-references' feature check
2021-09-14 15:42:50 +02:00
Eelco Dolstra
75837bb595
Respect NO_COLOR in Markdown output
2021-09-14 14:57:58 +02:00
dependabot[bot]
5052a81bba
Bump cachix/install-nix-action from 13 to 14
...
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action ) from 13 to 14.
- [Release notes](https://github.com/cachix/install-nix-action/releases )
- [Commits](https://github.com/cachix/install-nix-action/compare/v13...v14 )
---
updated-dependencies:
- dependency-name: cachix/install-nix-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-09-14 12:57:56 +00:00
Eelco Dolstra
7e4dd0e279
Merge pull request #5248 from edolstra/flake-clone
...
Fix 'nix flake clone' on github repos
2021-09-14 14:14:59 +02:00
Maximilian Bosch
