max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-16 11:16:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
15241 commits 7 branches 0 tags 64 MiB
Commit graph

15241 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robert Hensing
ef432b2b15
Merge pull request #8242 from obsidiansystems/recursive.nix 
Move `test/recursive.sh` nix expr to file
 2023-04-20 13:22:35 +02:00
John Ericson
969def696a Fix typo in tests 2023-04-19 20:47:23 -04:00
John Ericson
e26662709e Add a more interesting test 
In this one, we don't just output an existing derivation as is, but
modify it first.
 2023-04-19 20:36:33 -04:00
John Ericson
3eb343754e Move test/recursive.sh nix expr to file 
I found it hard to read as a big string literal.
 2023-04-19 19:36:05 -04:00
Rynn Blackmon
c4df53f154
Mention $DRV_PATH in post-build-hook docs 2023-04-19 16:32:47 -07:00
John Ericson
f3a31b14db Make tests/dyn-drv test dir 2023-04-19 18:49:50 -04:00
John Ericson
61d3e64fd0 Require daemon version for text hashing test 2023-04-19 17:24:55 -04:00
John Ericson
7103c6da70 Remove references from fixed output derivation ab syntax 
In other words, use a plain `ContentAddress` not
`ContentAddressWithReferences` for `DerivationOutput::CAFixed`.

Supporting fixed output derivations with (fixed) references would be a
cool feature, but it is out of scope at this moment.
 2023-04-19 15:00:04 -04:00
John Ericson
aba8a8a83a Add a few more content addressing methods 
Good to round out the library interface.
 2023-04-19 14:13:30 -04:00
John Ericson
20decfd302 Gate dynamic-derivations with drv fromJSON too 
Don't want `nix derivation add` to be a way to sneak by experimental
feature checks!
 2023-04-19 12:44:38 -04:00
John Ericson
76baaeb341 Merge remote-tracking branch 'upstream/master' into ca-drv-exotic 2023-04-19 11:32:14 -04:00
Théophane Hufschmitt
d3e2394e91
Merge pull request #8233 from wentasah/narinfo-corrupt-reason 
Make "NAR info file is corrupt" messages more informative
 2023-04-19 06:57:08 +02:00
Robert Hensing
28d7ffd448
Merge pull request #8220 from accelbread/whitelist-commit-lockfile-summary 
Add commit-lockfile-summary to flake nixConfig whitelist
 2023-04-18 16:49:33 +02:00
Robert Hensing
5cd9890e8a src/nix/flake.md: Itemize safe nixConfigs 2023-04-18 16:06:58 +02:00
Robert Hensing
7fcce6d48c
Merge pull request #8231 from obsidiansystems/add-derivation-xp-gates 
Gate experimental features in `DerivationOutput::fromJSON`
 2023-04-18 15:42:58 +02:00
Michal Sojka
d30d2dc861 Make "NAR info file is corrupt" messages more informative 
Recently, I encountered the "NAR info file 'xxxx' is corrupt" error
with my binary cache. The message is not helpful in determining, which
kind of corruption happened. The file, fetched with curl, looked
reasonably.

This commit adds more information to the error message, which should
allow debugging and hopefully fixing the problem.
 2023-04-18 14:10:49 +02:00
Valentin Gagarin
66e28e6343
Merge pull request #8236 from theutz/master 
Update installing-binary.md
 2023-04-18 14:08:32 +02:00
Michael Utz
40fcb22313
Update installing-binary.md 2023-04-18 13:18:30 +03:00
Valentin Gagarin
e1e6119761 Merge pull request #8235 from peeley/fix-nix-database-glossary-typo 
Documentation: fix typo for `Nix database` link in manual
 2023-04-18 11:05:08 +02:00
Noah Snelson
324ed0c367 Documentation: fix typo for Nix database link in manual 
Fixes broken link for `Nix database` anchor in the Glossary page of the
Nix manual.
 2023-04-17 20:15:08 -07:00
John Ericson
668377f217 TextHashMethod -> TextIngestionMethod, gate with XP feature 
I suppose we can use `dynamic-derivations` for the few things we neeed.
 2023-04-17 19:02:45 -04:00
John Ericson
f56c4a5bdf Merge remote-tracking branch 'upstream/master' into ca-drv-exotic 2023-04-17 18:10:12 -04:00
John Ericson
aa74c7b0bc Gate experimental features in DerivationOutput::fromJSON 
This is an entry point for outside data, so we need to check enabled
experimental features here.
 2023-04-17 17:36:12 -04:00
John Ericson
ab5ca608bf Merge remote-tracking branch 'upstream/master' into trustless-remote-builder-simple 2023-04-17 13:54:48 -04:00
John Ericson
23ee2d79a9 Use buildPathsWithResults in build-remote.cc trustless path 
It handles failures more correctly; I am glad we have it now!
 2023-04-17 13:49:14 -04:00
John Ericson
79ba0ba37a Improve the build remote comment. 2023-04-17 13:49:14 -04:00
Robert Hensing
64ee02890c
Merge pull request #8230 from obsidiansystems/daemon-trust-override 
Experimentally allow forcing `nix-daemon` trust; use this to test
 2023-04-17 19:43:41 +02:00
Robert Hensing
c56705c025
Merge pull request #8194 from obsidiansystems/redisplay-feature-gated-settings 
Fix some issues with experimental config settings
 2023-04-17 19:25:06 +02:00
John Ericson
d41e1bed5e Experimentally allow forcing nix-daemon trust; use this to test 
We finally test the status quo of remote build trust in a number of
ways. We create a new experimental feature on `nix-daemon` to do so.

PR #3921, which improves the situation with trustless remote building,
will build upon these changes. This code / tests was pull out of there
to make this, so everything is easier to review, and in particular we
test before and after so the new behavior in that PR is readily apparent
from the testsuite diff alone.
 2023-04-17 13:06:21 -04:00
John Ericson
2c8475600d Fix some issues with experimental config settings 
Issues:

1. Features gated on disabled experimental settings should warn and be
   ignored, not silently succeed.

2. Experimental settings in the same config "batch" (file or env var)
   as the enabling of the experimental feature should work.

3. For (2), the order should not matter.

These are analogous to the issues @roberth caught with my changes for
arg handling, but they are instead for config handling.

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2023-04-17 12:41:04 -04:00
Robert Hensing
3f9589f17e
Merge pull request #6312 from obsidiansystems/keyed-build-result 
Shuffle `BuildResult` data definition, make state machine clearer, introduce `SingleDrvOutputs`
 2023-04-17 18:08:05 +02:00
John Ericson
2eb493ca51 Fix DerivationOutput::fromJSON 2023-04-17 10:28:54 -04:00
Valentin Gagarin
39e0f609cc
Merge pull request #7514 from fricklerhandwerk/opt-I 
remove incorrect reference to `NIX_PATH` documentation
 2023-04-17 16:27:23 +02:00
John Ericson
e12efa3654 Merge remote-tracking branch 'upstream/master' into ca-drv-exotic 2023-04-17 10:16:57 -04:00
Robert Hensing
e641de085b
Merge pull request #3746 from obsidiansystems/path-info 
Introduce `StoreReferences` and `ContentAddressWithReferences`
 2023-04-17 15:49:48 +02:00
John Ericson
e95db8f2b9 nix-testing -> daemon-trust-override 
And only enable in the tests that need it. This makes it less of a
sledgehammer.
 2023-04-17 09:35:43 -04:00
John Ericson
b1343e8ad1 Merge remote-tracking branch 'upstream/master' into trustless-remote-builder-simple 2023-04-17 09:27:17 -04:00
John Ericson
537e8719f2
Explain various .self = false, 
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
 2023-04-17 09:15:11 -04:00
Valentin Gagarin
f4119a67cc
use @docroot@ link 2023-04-17 14:54:30 +02:00
Valentin Gagarin
d0cf615cbb
add link to nix-conf setting 
Co-authored-by: John Ericson <git@JohnEricson.me>
 2023-04-17 14:27:26 +02:00
John Ericson
72ffa7fedb
Merge pull request #7732 from hercules-ci/make-initLibStore-viable-alternative 
Make `initLibStore` a viable alternative
 2023-04-17 08:04:41 -04:00
Robert Hensing
cb2615cf47 Merge remote-tracking branch 'upstream/master' into source-path 2023-04-17 11:41:50 +02:00
Robert Hensing
9af9c260fc
Merge pull request #8193 from hercules-ci/dry-strings 
Deduplicate string literal rendering, fix 4909
 2023-04-17 11:19:40 +02:00
Robert Hensing
36a473c5e8
Merge pull request #8196 from obsidiansystems/fix-8162 
Mark experimental configuration settings programmatically
 2023-04-17 11:18:11 +02:00
John Ericson
9800c1e807 Mark experimental configuration settings programmatically 
Fix #8162

The test is changed to compare `nlohmann::json` values, not strings of dumped
JSON, which allows us to format things more nicely.
 2023-04-16 10:58:04 -04:00
John Ericson
ba9ae691b6 Add optionalString to manual Nix lang utilities 
Use it everywhere it could be also.
 2023-04-16 10:57:46 -04:00
Robert Hensing
b6125772d7 libexpr: Move identifier-like printing to print.cc 2023-04-16 14:07:35 +02:00
Robert Hensing
28a5cdde02 libexpr/value/print.* -> libexpr/print.* 
Generalizes the file to sensibly allow printing any part of the
language syntax.
 2023-04-16 13:10:45 +02:00
Robert Hensing
1e2dd669bc printLiteral: Do not overload 2023-04-16 13:04:35 +02:00
Robert Hensing
9c74df5bb4
Format 
Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
Co-authored-by: John Ericson <git@JohnEricson.me>
 2023-04-15 20:56:51 +02:00