moraxyc/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
11607 commits 1 branch 2 tags 68 MiB
Commit graph

11607 commits

This branch
This branch
All branches
Author SHA1 Message Date
Guillaume Maudoux
cbbbf36881 Use 'errorCtx' name everywhere 2022-03-04 22:55:14 +01:00
Guillaume Maudoux
57684d6247 fixup! s/forceValue/forceFunction/ where applicable 2022-03-04 22:51:56 +01:00
Guillaume Maudoux
ed02fa3c40 s/forceValue/forceFunction/ where applicable 2022-03-04 22:15:30 +01:00
Guillaume Maudoux
3a5855353e Add detailed error mesage for coerceTo{String,Path} 2022-03-04 21:47:58 +01:00
Guillaume Maudoux
be1f069746 Add error context for most basic coercions 2022-03-04 05:04:47 +01:00
Guillaume Maudoux
00e242feed Add some context to coercion error strings 2022-03-03 21:46:20 +01:00
Eelco Dolstra
391f4fcabe
Merge pull request #6201 from edolstra/print-value 
printValue(): Don't show repeated values
 2022-03-03 14:35:16 +01:00
Eelco Dolstra
e9c04c3351 Be more aggressive in hiding repeated values 
We now memoize on Bindings / list element vectors rather than Values,
so that e.g. two Values that point to the same Bindings will be
printed only once.
 2022-03-03 13:33:34 +01:00
Eelco Dolstra
ecff9d969a printValue(): Don't show repeated values 
Fixes #6157.
 2022-03-03 13:18:23 +01:00
Eelco Dolstra
6097790863 Fix segfault in headerCallback() 
https://hydra.nixos.org/build/168594664
 2022-03-03 11:11:16 +01:00
Eelco Dolstra
885d709393
Merge pull request #6198 from edolstra/coerce-store-path 
Add EvalState::coerceToStorePath() helper
 2022-03-03 10:02:51 +01:00
Eelco Dolstra
a7c835e9cb
Use C++11-style initializer 
Co-authored-by: John Ericson <git@JohnEricson.me>
 2022-03-03 10:02:11 +01:00
Eelco Dolstra
b55d79728c Add EvalState::coerceToStorePath() helper 
This is useful whenever we want to evaluate something to a store path
(e.g. in get-drvs.cc).

Extracted from the lazy-trees branch (where we can require that a
store path must come from a store source tree accessor).
 2022-03-02 23:58:58 +01:00
Eelco Dolstra
3e3d0711d4
Merge pull request #6197 from edolstra/nix-profile-ca 
nix profile: Support CA derivations
 2022-03-02 23:48:52 +01:00
Eelco Dolstra
d4538034b7 nix profile test: Restart daemon 
Fixes

  nix-daemon: src/libstore/sqlite.cc:97: nix::SQLiteStmt::Use::Use(nix::SQLiteStmt&): Assertion `stmt.stmt' failed.

which happens because the daemon doesn't properly handle the case
where ca-derivations isn't enabled at daemon startup.
 2022-03-02 23:08:49 +01:00
Eelco Dolstra
3a3821bcd7 Remove obsolete todo 2022-03-02 22:22:55 +01:00
Eelco Dolstra
b0d65b3d11 Silence kill output 2022-03-02 22:22:23 +01:00
Eelco Dolstra
d2586188fe tests/common.sh.in: Add enableFeatures helper 2022-03-02 21:48:25 +01:00
Eelco Dolstra
5d208cbe41 mk/run_test.sh: Add missing backslash 2022-03-02 21:36:46 +01:00
Eelco Dolstra
f9375778ae nix profile: Add a test for non-flake packages 2022-03-02 20:56:40 +01:00
Eelco Dolstra
161f798aa1 nix profile: Support CA derivations 2022-03-02 20:38:51 +01:00
Eelco Dolstra
54888b92de Move installables-related operations 2022-03-02 19:19:51 +01:00
Eelco Dolstra
b2da2a22c6
Merge pull request #6194 from edolstra/nix-profile 
Add basic tests for 'nix profile'
 2022-03-02 16:07:00 +01:00
Eelco Dolstra
5850fd17b4 Add basic tests for 'nix profile' 
Fixes #6193.
 2022-03-02 14:40:46 +01:00
Eelco Dolstra
1aca6b9f17
Merge pull request #4345 from bjornfor/installer-configurable-uid-gid 
installer: allow overriding nix user GID and UIDs
 2022-03-02 12:38:52 +01:00
Eelco Dolstra
b39ef07414 Style 2022-03-02 11:46:15 +01:00
Eelco Dolstra
c10865a46e tests: Rename nix-profile.sh -> bash-profile.sh 2022-03-02 11:21:00 +01:00
Eelco Dolstra
010ffc31f8 Remove stray debug line 2022-03-02 11:20:32 +01:00
Eelco Dolstra
03df331c3f
Merge pull request #6189 from obsidiansystems/build-result-header 
Move `BuildResult` defintion to its own header
 2022-03-02 08:47:51 +01:00
Eelco Dolstra
3c66839b9d
Merge pull request #6190 from andersk/bel 
filterANSIEscapes: Ignore BEL character
 2022-03-02 08:46:19 +01:00
Anders Kaseorg
b5cd3e2d5c filterANSIEscapes: Ignore BEL character 
GCC is not as good at music as it seems to think it is.  Fixes #4546.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
 2022-03-01 15:35:42 -08:00
John Ericson
e862833ec6 Move BuildResult defintion to its own header 
Just like we did for `ValidPathInfo` in
d92d4f85a5.
 2022-03-01 19:43:07 +00:00
Bjørn Forsman
f4d57aa490 installer: allow overriding nix user GID and UIDs 
Needed to resolve conflict in case the default GID and UIDs are in use.
 2022-03-01 19:17:41 +01:00
Eelco Dolstra
9087fe0760
Merge pull request #6187 from thufschmitt/allow-the-darwin-tests-to-be-flaky 
Acknowledge that the macOS tests are flaky
 2022-03-01 19:11:36 +01:00
regnat
c511134a94 Acknowledge that the macOS tests are flaky 
Restart the tests (at most once) on `unexpected EOF` errors.

This is truly ugly, but might prevent half of the CI runs to fail
because of https://github.com/NixOS/nix/issues/3605
 2022-03-01 15:25:05 +01:00
Eelco Dolstra
0cb5af5000
Merge pull request #6185 from hercules-ci/fetchTree-reuse-local-paths 
fetchTree: Use isValidPath, add comment
 2022-03-01 13:15:42 +01:00
Robert Hensing
b6deca7c0d fetchTree: Use isValidPath, add comment 2022-03-01 12:11:10 +01:00
Eelco Dolstra
d974d2ad59 fetch{url,Tarball}: Remove 'narHash' attribute 
This was introduced in #6174. However fetch{url,Tarball} are legacy
and we shouldn't have an undocumented attribute that does the same
thing as one that already exists ('sha256').
 2022-03-01 11:30:26 +01:00
Eelco Dolstra
9ab81a9d38
Merge pull request #6183 from obsidiansystems/sort-config 
Move some stuff from `Settings` to a new `FetchSettings`.
 2022-03-01 10:52:55 +01:00
Théophane Hufschmitt
983c991652
Merge pull request #6174 from hercules-ci/fetchTree-reuse-local-paths 
fetchTree: Do not re-fetch paths already present + refactor
 2022-03-01 10:29:32 +01:00
John Ericson
ea71da395f Move some stuff from Settings to a new FetchSettings. 
Starting work on #5638

The exact boundary between `FetchSettings` and `EvalSettings` is not
clear to me, but that's fine. First lets clean out `libstore`, and then
worry about what, if anything, should be the separation between those
two.
 2022-03-01 01:39:25 +00:00
Robert Hensing
ee019d0afc Add EvalState::allowAndSetStorePathString helper 
This switches addPath from `printStorePath` to `toRealPath`.
 2022-02-28 21:37:49 +01:00
Robert Hensing
158280d8e9 fetchTree: Do not re-fetch paths already present 2022-02-28 21:37:49 +01:00
Théophane Hufschmitt
1c985428c4
Merge pull request #6179 from NixOS/properly-start-the-daemon-in-tests 
tests: Fix the start of the daemon
 2022-02-28 19:23:50 +01:00
regnat
b8f8aef9d3 tests: Fix the start of the daemon 
- Make sure that it starts even without the `nix-command` xp feature
- Fail if it doesn’t manage to start

This fixes a 30s wait for every test in `init.sh` as the daemon couldn’t
start, but the code was just waiting 30s and continuing as if everything
was all right.
 2022-02-28 17:00:31 +01:00
Eelco Dolstra
b592359c56
Merge pull request #6178 from edolstra/fix-darwin 
Fix Darwin build
 2022-02-28 16:13:00 +01:00
Eelco Dolstra
b91500a14e Fix clang warning 2022-02-28 15:48:26 +01:00
Eelco Dolstra
a949673a5b Fix Darwin build 
Fixes #6169
 2022-02-28 15:48:26 +01:00
Théophane Hufschmitt
c2720797d5
Merge pull request #6072 from Ma27/fix-nix-why-depends-non-precise 
nix/why-depends: fix output when not using `--precise`
 2022-02-28 11:46:50 +01:00
Domen Kožar
e85d565b5a
Merge pull request #6123 from abathur/fix_6122 
install-darwin: fix mount permission edge-case
 2022-02-28 08:45:22 +00:00