aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-09-30Merge remote-tracking branch 'upstream/master' into path-infoJohn Ericson
2021-09-30Merge pull request #5307 from Radvendii/masterEelco Dolstra
reset yylloc when yyless(0) is called
2021-09-29reset yylloc when yyless(0) is calledTaeer Bar-Yam
2021-09-29Merge pull request #5301 from Ma27/builtins-missing-feature-errorEelco Dolstra
libexpr: throw a more helpful eval-error if a builtin is not available due to a missing feature-flag
2021-09-29libexpr: throw a more helpful eval-error if a builtin is not available due ↵Maximilian Bosch
to a missing feature-flag I found it somewhat confusing to have an error like error: attribute 'getFlake' missing if the required experimental-feature (`flakes`) is not enabled. Instead, I'd expect Nix to throw an error just like it's the case when using e.g. `nix flake` without `flakes` being enabled. With this change, the error looks like this: $ nix-instantiate -E 'builtins.getFlake "nixpkgs"' error: Cannot call 'builtins.getFlake' because experimental Nix feature 'flakes' is disabled. You can enable it via '--extra-experimental-features flakes'. at «string»:1:1: 1| builtins.getFlake "nixpkgs" | ^ I didn't use `settings.requireExperimentalFeature` here on purpose because this doesn't contain a position. Also, it doesn't seem as if we need to catch the error and check for the missing feature here since this already happens at evaluation time.
2021-09-29flake.lock: UpdateEelco Dolstra
Flake lock file changes: • Updated input 'lowdown-src': 'github:kristapsdz/lowdown/0b85e777f3cdacf4210f0d624a0ceec8df612e05' (2021-09-23) → 'github:kristapsdz/lowdown/6bd668af3fd098bdd07a1bedd399564141e275da' (2021-09-24) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/f6551e1efa261568c82b76c3a582b2c2ceb1f53f' (2021-08-11) → 'github:NixOS/nixpkgs/82891b5e2c2359d7e58d08849e4c89511ab94234' (2021-09-28)
2021-09-29Merge pull request #5295 from Ma27/bmcheck-fod-mismatchEelco Dolstra
build: also throw hash-mismatch errors if `buildMode == bmCheck`
2021-09-27build: also throw hash-mismatch errors if `buildMode == bmCheck`Maximilian Bosch
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-27Fix 'error: reading a line: Input/output error' in startBuilder()Eelco Dolstra
With -vvvv, the ProgressBar was polluting the stderr of the child, messing up its \2 message to the parent.
2021-09-27Don't copy in rethrowEelco Dolstra
2021-09-27nix path-info -r: Don't duplicate the root pathsEelco Dolstra
This fixes $ nix path-info -r $(type -P ls) /nix/store/vfilzcp8a467w3p0mp54ybq6bdzb8w49-coreutils-8.32 /nix/store/5d821pjgzb90lw4zbg6xwxs7llm335wr-libunistring-0.9.10 ... /nix/store/mrv4y369nw6hg4pw8d9p9bfdxj9pjw0x-acl-2.3.0 /nix/store/vfilzcp8a467w3p0mp54ybq6bdzb8w49-coreutils-8.32 Also, output the paths in topologically sorted order like we used to.
2021-09-27run(): MoveEelco Dolstra
2021-09-27Merge pull request #5292 from edolstra/update-lowdownEelco Dolstra
Update lowdown
2021-09-27Use separate lowdownEelco Dolstra
Overriding the lowdown in nixpkgs can break nixUnstable.
2021-09-24Merge pull request #4573 from oxalica/fix/git-init-spamEelco Dolstra
Explicitly set default branch name for git to suppress "git hint"
2021-09-24Explicitly set initial branch name for gitoxalica
2021-09-24Use latest lowdownEelco Dolstra
This improves list rendering (https://github.com/kristapsdz/lowdown/issues/73).
2021-09-24flake.lock: UpdateEelco Dolstra
Flake lock file changes: • Updated input 'lowdown-src': 'github:kristapsdz/lowdown/b4483d0ef85990f54b864158ab786b4a5b3904fa' (2021-08-06) → 'github:kristapsdz/lowdown/0b85e777f3cdacf4210f0d624a0ceec8df612e05' (2021-09-23)
2021-09-24Merge pull request #5253 from edolstra/flake-ifdEelco Dolstra
Don't allow IFD in flakes by default
2021-09-23Merge pull request #5290 from edolstra/ssh-nologinEelco Dolstra
SSHStore / LegacySSHStore: Show better error if the remote's stdout is polluted
2021-09-23Shut down write side before draining the read sideEelco Dolstra
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-23SSHStore / LegacySSHStore: Show a better error message if the remote is ↵Eelco Dolstra
"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-23Remove risky char *Eelco Dolstra
2021-09-23Add some more instrumentationEelco Dolstra
2021-09-23Merge pull request #5284 from edolstra/revert-4922Eelco Dolstra
Revert "Merge pull request #4922 from nrdxp/default-submodules"
2021-09-22Revert "Merge pull request #4922 from nrdxp/default-submodules"Eelco Dolstra
This reverts commit 6678e98411cd3bfe8143a4ba1b35d1451babce32, reversing changes made to 90b2dd570cbd8313a8cf45b3cf66ddef2bb06e07.
2021-09-22Disable IFD selectivelyEelco Dolstra
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-22Make setDefault() typedEelco Dolstra
2021-09-22QuietEelco Dolstra
2021-09-22Don't cache realiseContext() errorsEelco Dolstra
Errors that depend on the configuration (such as whether allow-import-from-derivation is set) should not be cached.
2021-09-22Add missing #includeEelco Dolstra
Fixes #5282.
2021-09-22Merge pull request #5281 from abathur/install_macos_montereyEelco Dolstra
fix install on macOS monterey
2021-09-21fix install on macOS montereyTravis A. Everett
2021-09-21Merge pull request #5279 from edolstra/restrict-path-inputsEelco Dolstra
Fix relative path input handling
2021-09-21Set input parent at construction timeEelco Dolstra
2021-09-21Allow relative paths anywhere into the parent's store pathEelco Dolstra
2021-09-21path fetcher: Fix relative path checkEelco Dolstra
2021-09-20Merge pull request #5277 from NixOS/regnat/ci-better-cache-usageEelco Dolstra
flake: Use the real nixUnstable from nixpkgs
2021-09-20flake: Use the real nixUnstable from nixpkgsregnat
Don’t let it pick our overriden lowdown as that would cause it not to be cached in cache.nixos.org
2021-09-20Merge pull request #5266 from gkleen/fix/s3-cache-schemeEelco Dolstra
Fix scheme query parameter for s3 cache
2021-09-17Fix scheme argument to s3 cacheGregor Kleen
2021-09-17Merge pull request #5263 from greedy/fix-5261Eelco Dolstra
Include subpath in flake fingerprint
2021-09-16Include subpath in flake fingerprintGeoff Reedy
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-15Merge pull request #5257 from edolstra/dirty-lock-fileEelco Dolstra
If we can't write a lock file, pretend the top-level flake is dirty
2021-09-15Merge branch 'mh/fix-chroot-eval' of https://github.com/obsidiansystems/nixEelco Dolstra
2021-09-15If we can't write a lock file, pretend the top-level flake is dirtyEelco Dolstra
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-15Revert "Disallow reading flake.lock"Eelco Dolstra
This reverts commit e5596113f7fc5e47e058bb15afdf75eee02ed95e.
2021-09-15Merge pull request #5251 from emilazy/darwin-sandbox-rosetta-2Eelco Dolstra
sandbox: allow Rosetta 2 on Darwin
2021-09-15sandbox: allow Rosetta 2 on DarwinEmily
This allows sandboxed x86_64-darwin builds on aarch64-darwin.
2021-09-14Rename unnecessary git@Eelco Dolstra