Eelco Dolstra
9fe0343bfd
Merge branch 'master' of github.com:NixOS/nix
2021-11-15 18:45:20 +01:00
Eelco Dolstra
671817a858
Simplify lockFlake() a bit
2021-11-15 18:44:27 +01:00
Eelco Dolstra
d1d223838b
Merge branch 'balsoft/fix-subinputs-not-getting-updated' of https://github.com/tweag/nix
2021-11-15 18:37:13 +01:00
Domen Kožar
c5c7cca2be
Merge pull request #5394 from NixOS/backport
...
Add backport action
2021-11-15 10:36:55 -06:00
Domen Kožar
1d0bc96c96
Add backport action
2021-11-15 08:41:03 -06:00
Domen Kožar
164179983e
Merge pull request #5428 from kreisys/add-pos-to-json-type-error
...
toJSON: report error position for fancier output
2021-11-15 07:57:46 -06:00
Eelco Dolstra
ed33033926
Merge pull request #5553 from kamadorueda/issue-3505
...
toXML: display errors position
2021-11-15 11:49:52 +01:00
Eelco Dolstra
a10a72b4e0
Merge pull request #5555 from kamadorueda/typos
...
fix many doc typos
2021-11-15 11:48:33 +01:00
79d07d0980
libfetchers: set free gitlab headers
2021-11-14 12:23:46 +01:00
Kevin Amado
eae54f2d52
fix many doc typos
2021-11-13 22:28:20 -05:00
Kevin Amado
d0e9e18489
toXML: display errors position
...
- This change applies to builtins.toXML and inner workings
- Proof of concept:
```nix
let e = builtins.toXML e; in e
```
- Before:
```
$ nix-instantiate --eval poc.nix
error: infinite recursion encountered
```
- After:
```
$ nix-instantiate --eval poc.nix
error: infinite recursion encountered
at /data/github/kamadorueda/nix/poc.nix:1:9:
1| let e = builtins.toXML e; in e
|
```
2021-11-13 20:33:34 -05:00
regnat
83af9550a1
Add a test for the --accept-flake-config option
2021-11-12 16:02:32 +01:00
Tom Bereknyei
30496af598
Adds an accept-flake-config flag
2021-11-12 09:50:07 -05:00
Eelco Dolstra
bceda30498
Typo
2021-11-12 13:41:15 +01:00
Eelco Dolstra
f7afc26803
Merge pull request #5533 from abathur/improve_existing_backup_profile_msg_2
...
installer: make rc replacement instructions explicit
2021-11-12 10:40:26 +01:00
Eelco Dolstra
44aed58538
Merge pull request #5540 from samueldr/fix/key-subcommand
...
nix key: Fix error message and don't require flakes
2021-11-12 10:38:00 +01:00
Eelco Dolstra
c78155b436
Merge pull request #5542 from samueldr/fix/registry-experimental
...
nix registry: Mark experimental
2021-11-12 10:37:00 +01:00
30e5c5c55f
nix registry: Mark experimental
...
This is part of the flakes feature. Mark it as such.
2021-11-12 03:18:31 -05:00
c1dea92dd6
nix key: Fix error message and don't require flakes
2021-11-11 21:31:26 -05:00
Rok Garbas
a118a70649
Documenting how to use/build Nix' Docker image
2021-11-11 16:07:01 +01:00
Eelco Dolstra
c1bf9e39f1
docker.nix: Use 'with'
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-11 16:07:01 +01:00
Rok Garbas
93f7fb6e74
Docker image with Nix inside
2021-11-11 16:07:01 +01:00
Alexander Bantyev
07bffe7998
Flakes: refetch the input when a follows disappears
...
When an input follows disappears, we can't just reuse the old lock
file entries since we may be missing some required ones. Refetch the
input when this happens.
Closes https://github.com/NixOS/nix/issues/5289
2021-11-11 12:05:18 +03:00
Travis A. Everett
cc78901ccb
installer: make rc replacement instructions explicit
2021-11-10 14:06:18 -06:00
Eelco Dolstra
52a3b2ee63
Merge pull request #5524 from abathur/improve_existing_backup_profile_msg
...
installer: improve existing rc backup nag
2021-11-10 20:50:09 +01:00
Eelco Dolstra
a218cfd6c7
Merge pull request #5528 from matthewbauer/recognize-nixosModule
...
Recognize singular "nixosModule" in nix flake show
2021-11-10 12:17:11 +01:00
Matthew Bauer
ceeecf2f9e
Recognize singular "nixosModule" in nix flake show
...
This makes nixosModule appears as a "NixOS Module" like nixosModules
does.
2021-11-09 11:14:15 -06:00
Eelco Dolstra
67179472df
Merge pull request #5494 from tweag/balsoft/allow-references-in-addPath
...
Allow references in addPath
2021-11-09 15:57:39 +01:00
Travis A. Everett
f7859eef49
installer: improve existing rc backup nag
2021-11-09 08:14:51 -06:00
Eelco Dolstra
884ef336c4
Merge pull request #5519 from edolstra/move-unshare
...
Unshare mount namespace in main()
2021-11-09 12:33:25 +01:00
Alexander Bantyev
0b005bc9d6
addToStore, addToStoreFromDump: refactor: pass refs by const reference
...
Co-Authored-By: Eelco Dolstra <edolstra@gmail.com>
2021-11-09 12:24:49 +03:00
Eelco Dolstra
25d2316e8f
Merge pull request #5520 from NixOS/dependabot/github_actions/actions/checkout-2.4.0
...
Bump actions/checkout from 2.3.5 to 2.4.0
2021-11-09 09:16:42 +01:00
Travis A. Everett
69431edbc1
installer: clarify starting assumption task
...
We had a macOS user present in Matrix with some confusion because the
lack of a clear task statement here made them think the error meant
that a problem had occurred during the preceding task in a macOS
install: "Fixing any leftover Nix volume state"
2021-11-08 17:03:09 -06:00
dependabot[bot]
732dd90428
Bump actions/checkout from 2.3.5 to 2.4.0
...
Bumps [actions/checkout](https://github.com/actions/checkout ) from 2.3.5 to 2.4.0.
- [Release notes](https://github.com/actions/checkout/releases )
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md )
- [Commits](https://github.com/actions/checkout/compare/v2.3.5...v2.4.0 )
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2021-11-08 22:00:58 +00:00
Eelco Dolstra
ff2af4d64e
Unshare mount namespace in main()
...
Doing it as a side-effect of calling LocalStore::makeStoreWritable()
is very ugly.
Also, make sure that stopping the progress bar joins the update
thread, otherwise that thread should be unshared as well.
2021-11-08 22:00:45 +01:00
Eelco Dolstra
7a71621b7c
Merge branch 'fix-writable-shell' of https://github.com/yorickvP/nix
2021-11-08 21:12:51 +01:00
Eelco Dolstra
6c2af1f201
Merge pull request #5434 from timothyklim/git-url-submodules
...
Support building flakes from a Git repo url with submodules
2021-11-08 14:13:42 +01:00
Eelco Dolstra
d9c9d0e0eb
Merge pull request #5500 from abathur/fix_darwin_existing_mounted_volume
...
darwin-install: fix already-mounted store volumes
2021-11-08 13:55:19 +01:00
Eelco Dolstra
736d6ab721
Merge pull request #5504 from NixOS/flake-options-and-daemon
...
Make the flake options work when using the daemon
2021-11-08 13:54:55 +01:00
Eelco Dolstra
c9ecc0948b
Merge pull request #5506 from NixOS/fix-post-hook-test-with-different-daemon
...
Make the post-build-hook use the daemon Nix package
2021-11-08 13:53:30 +01:00
Eelco Dolstra
0fd96eeb09
Merge pull request #5517 from Zimmi48/fix-cli-guideline-typo
...
Fix some typos in CLI guideline.
2021-11-08 13:52:57 +01:00
Eelco Dolstra
b5cb31e032
Merge pull request #5514 from andir/let-body-unused
...
Remove unused "<let-body>" symbol
2021-11-08 13:52:32 +01:00
Théo Zimmermann
d589782fb0
Fix some typos in CLI guideline.
2021-11-08 08:24:15 +01:00
Andreas Rammhold
8e7359db64
Remove unused "<let-body>" symbol
...
The requirement for the symbol has been removed since at least 7d47498
2021-11-07 18:26:43 +01:00
Alexander Bantyev
9d4dcff37a
addPath: allow paths with references
...
Since 4806f2f6b0
2021-11-05 22:41:30 +03:00
Théophane Hufschmitt
3d6ee223d6
Merge pull request #5476 from NixOS/ca/fix-build-in-nix-repl
...
Fix `nix repl`’s building of CA derivations
2021-11-05 17:35:18 +01:00
regnat
1f3c3a3785
Make the flake options work when using the daemon
...
When setting flake-local options (with the `nixConfig` field), forward
these options to the daemon in case we’re using one.
This is necessary in particular for options like `binary-caches` or
`post-build-hook` to make sense.
Fix <343239fc8a (r44356843)
2021-11-05 16:19:16 +01:00
Eelco Dolstra
a1c1b0e553
Merge pull request #5501 from edolstra/optimize-calls
...
Optimize primop calls
2021-11-05 12:57:19 +01:00
regnat
93eadd5803
Make the post-build-hook use the daemon Nix package
...
Having the `post-build-hook` use `nix` from the client package can lead
to a deadlock in case there’s a db migration to do between both, as a
`nix` command running inside the hook will run as root (and as such will
bypass the daemon), so might trigger a db migration, which will get
stuck trying to get a global lock on the DB (as the daemon that ran the
hook already has a lock on it).
2021-11-05 11:11:33 +01:00
regnat
1a4c9ba50b
Fix nix repl’s building of CA derivations
...
When running a `:b` command in the repl, after building the derivations
query the store for its outputs rather than just assuming that they are
known in the derivation itself (which isn’t true for CA derivations)
Fix #5328
2021-11-05 11:04:14 +01:00
