8cc8551afd
Merge remote-tracking branch 'nixos/master'
2022-12-24 16:39:35 +01:00
Eelco Dolstra
3dbf9b5af5
Merge pull request #7367 from lheckemann/nixpkgs-22.11
...
Bump nixpkgs to 22.11
2022-12-23 23:20:48 +01:00
Eelco Dolstra
14f7dae3e4
Merge pull request #7503 from edolstra/fix-dirOf
...
Fix CanonPath::dirOf() returning a string_view of a temporary
2022-12-23 16:17:48 +01:00
Eelco Dolstra
64c60f7241
Fix CanonPath::dirOf() returning a string_view of a temporary
...
https://hydra.nixos.org/build/202837872
2022-12-23 15:32:54 +01:00
Eelco Dolstra
c9eee5a84d
Merge pull request #7493 from mupdt/primops-storeDir-test-non-standard-path
...
primops `storeDir` test uses `settings.nixStore`
2022-12-22 16:18:48 +01:00
Eelco Dolstra
b1223e1b62
Merge pull request #7489 from mupdt/nar-info-disk-cache-race-condition
...
[PDT] TDE-3114: prevent a race-condition when creating the S3 cache
2022-12-21 13:09:54 +01:00
mupdt
a33e45b60b
primops storeDir
test uses settings.nixStore
2022-12-21 07:01:57 -05:00
mupdt
bc8ab21c5a
[PDT] TDE-3114: prevent a race-condition when creating the S3 cache
2022-12-21 04:50:40 -05:00
Robert Hensing
1437582ccd
doc/book.toml: Improve config ( #7300 )
...
* doc/book.toml: Improve config
- `title` value will be added to the HTML <title> - here</title>
- `git-repository-url` adds a link to the GitHub repo in the top right corner
- `edit-url-template` adds an edit link, inviting contributions
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2022-12-20 16:29:32 +01:00
Eelco Dolstra
3fa246d3bc
Merge pull request #7483 from fricklerhandwerk/glossary-fixups
...
make relative links explicit
2022-12-20 15:13:20 +01:00
Valentin Gagarin
7e31a991db
make relative links explicit
2022-12-20 14:28:43 +01:00
Eelco Dolstra
17373debe9
Merge pull request #7411 from edolstra/no-gpg
...
Remove GPG-signing of releases
2022-12-20 12:55:29 +01:00
Eelco Dolstra
8332ac6a1d
Merge pull request #7451 from edolstra/abstract-pos
...
Introduce AbstractPos
2022-12-20 12:55:13 +01:00
Théophane Hufschmitt
000dd77d8d
Merge pull request #7473 from hercules-ci/sqlite-error
...
Improve sqlite error messages
2022-12-20 11:27:30 +01:00
Théophane Hufschmitt
c3d522dc51
Merge pull request #7480 from nrdxp/fix-develop-drv
...
fix(develop): make `nix develop` drv recreatable
2022-12-20 07:41:46 +01:00
Timothy DeHerrera
94cf0da7b2
fix(develop): make nix develop
drv recreatable
2022-12-19 13:16:06 -07:00
Domen Kožar
f118e661e0
Merge pull request #7462 from rapenne-s/improve_messaging_reusing_trusted_substituter
...
Inform user instead of warning them when using a trusted substituter
2022-12-19 16:04:01 +00:00
Eelco Dolstra
d00bfe4833
Merge pull request #7450 from edolstra/canon-path
...
Add CanonPath wrapper to represent canonicalized paths
2022-12-19 16:21:11 +01:00
Linus Heckemann
1c40182b12
fixup: remove boehmgc patch
2022-12-19 13:35:05 +01:00
8615547a51
fix incorrect merge
2022-12-17 23:00:58 +01:00
d0e7062a64
hackily edit boehmgc-coroutine-sp-fallback.diff to work on both 8.0.x and 8.2.x
2022-12-17 21:58:38 +01:00
60c5064be8
remove patchNetrcRegression
2022-12-17 15:28:00 +01:00
Robert Hensing
c965f35de7
Improve sqlite error messages
...
They did not include the detailed error message, losing essential
information for troubleshooting.
Example message:
warning: creating statement 'insert or rplace into NARs(cache, hashPart, namePart, url, compression, fileHash, fileSize, narHash, narSize, refs, deriver, sigs, ca, timestamp, present) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1)': at offset 10: SQL logic error, near "rplace": syntax error (in '/tmp/nix-shell.grQ6f7/nix-test/tests/binary-cache/test-home/.cache/nix/binary-cache-v6.sqlite')
It's not the best example; more important information will be in
the message for e.g. a constraint violation.
I don't see why this specific error is printed as a warning, but
that's for another commit.
2022-12-17 14:51:37 +01:00
74ecb58b74
Merge remote-tracking branch 'nixos/master'
2022-12-17 13:36:27 +01:00
Solène Rapenne
d0660c6c0b
printMsg replacement by printInfo
...
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
2022-12-16 09:34:22 +01:00
Eelco Dolstra
26c7602c39
Merge pull request #7465 from edolstra/impure-derivations-dry-run
...
Fix a crash in DerivedPath::Built::toJSON() with impure derivations
2022-12-15 18:15:23 +01:00
Eelco Dolstra
0687e16c4a
Fix a crash in DerivedPath::Built::toJSON() with impure derivations
...
The use of 'nullptr' here didn't result in a null JSON value, but in a
nullptr being cast to a string, which aborts.
2022-12-15 16:02:27 +01:00
Solène Rapenne
98e01da0b1
warnings: switch to info level when using a saved substituter
2022-12-14 14:11:21 +01:00
Eelco Dolstra
5d77c08858
Merge pull request #7458 from ncfavier/disable-build-users
...
Allow disabling build users by unsetting `build-users-group`
2022-12-14 11:56:42 +01:00
Naïm Favier
1f3c0a3c1d
Allow disabling build users by unsetting build-users-group
...
Unsetting `build-users-group` (without `auto-allocate-uids` enabled)
gives the following error:
```
src/libstore/lock.cc:25: static std::unique_ptr<nix::UserLock> nix::SimpleUserLock::acquire(): Assertion `settings.buildUsersGroup != ""' failed.
```
Fix the logic in `useBuildUsers` and document the default value
for `build-users-group`.
2022-12-14 00:40:30 +01:00
Eelco Dolstra
9fa8b02c41
Merge pull request #7456 from ncfavier/fix-links
...
doc: fix links
2022-12-13 17:27:13 +01:00
Eelco Dolstra
46b3c026fc
Merge pull request #7455 from rapenne-s/documentation_fix
...
Add anchors and links to definition
2022-12-13 17:26:52 +01:00
Eelco Dolstra
e2a4e7aecd
Merge pull request #4543 from obsidiansystems/indexed-store-path-outputs
...
Low level `<drvPath>^<outputName>` installable syntax to match existing `<highLevelInstallable>^<outputNames>` syntax
2022-12-13 17:22:29 +01:00
Eelco Dolstra
c9b0a85b08
Restore display of source lines for stdin/string inputs
2022-12-13 16:00:44 +01:00
Naïm Favier
129ece7ce9
doc: fix links
2022-12-13 15:49:40 +01:00
Eelco Dolstra
aea97f07a3
Fix compilation
2022-12-13 15:23:12 +01:00
Eelco Dolstra
1315133b50
Improve cast safety
...
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com>
2022-12-13 12:38:33 +01:00
Solène Rapenne
09860c16ce
documentation: use sections instead of list items
2022-12-13 11:47:44 +01:00
Solène Rapenne
e43b0f5b12
documentation: link flake URL term to definition
2022-12-13 11:47:38 +01:00
Solène Rapenne
ae27181f16
documentation: fix link to definition
2022-12-13 11:47:22 +01:00
Eelco Dolstra
af5582ca53
Merge pull request #7454 from tweag/build-no-gc-in-hydra
...
Build Nix with the GC disabled in hydra
2022-12-13 11:23:33 +01:00
Théophane Hufschmitt
2ec6685eb0
Build Nix with the GC disabled in hydra
...
Make sure that it still compiles as it's easy to accidentally break one
of the `#if` guarded clauses
2022-12-13 10:44:07 +01:00
Théophane Hufschmitt
6e31d27cba
Merge pull request #6741 from Mindavi/nix-no-gc
...
support building with --enable-gc=no
2022-12-13 10:36:59 +01:00
Eelco Dolstra
b3fdab28a2
Introduce AbstractPos
...
This makes the position object used in exceptions abstract, with a
method getSource() to get the source code of the file in which the
error originated. This is needed for lazy trees because source files
don't necessarily exist in the filesystem, and we don't want to make
libutil depend on the InputAccessor type in libfetcher.
2022-12-13 00:50:43 +01:00
John Ericson
f61d575810
Merge branch 'indexed-store-path-outputs' of github.com:obsidiansystems/nix into indexed-store-path-outputs
2022-12-12 17:43:10 -05:00
John Ericson
5273cf4c97
Merge remote-tracking branch 'upstream/master' into indexed-store-path-outputs
2022-12-12 17:40:49 -05:00
John Ericson
32ae715db1
Fix typos in the docs
...
Thanks!
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
2022-12-12 17:37:45 -05:00
John Ericson
dabb03b8d0
Merge remote-tracking branch 'upstream/master' into indexed-store-path-outputs
2022-12-12 17:36:02 -05:00
John Ericson
c886b18561
Merge new tests into build.sh
2022-12-12 17:34:57 -05:00
John Ericson
d8c1c24c78
Adjust docs
2022-12-12 17:32:24 -05:00