qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
11599 commits 57 branches 0 tags 73 MiB
Commit graph

11599 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Eelco Dolstra df552ff53e Remove std::string alias (for real this time) 
Also use std::string_view in a few more places.
 2022-02-25 16:13:02 +01:00
Eelco Dolstra 14b38d0887 xml-writer: Remove std aliases 2022-02-25 16:13:02 +01:00
Théophane Hufschmitt fd4b693ca2
Merge pull request #6164 from kamadorueda/issue-5859 
refactor: remove verbose-build from docs
 2022-02-25 15:29:59 +01:00
Kevin Amado b312d4d096
refactor: remove verbose-build from docs 
- From what I see it is an implementation detail
  but is no longer configurable from the settings
 2022-02-25 09:16:42 -05:00
Eelco Dolstra 9d4697453f ExprAttrs::show(): Show attrs in sorted order 
Issue #6160.
 2022-02-25 09:21:04 +01:00
Eelco Dolstra 59683733f5
Merge pull request #6089 from edolstra/dot-default 
Replace defaultBla.$system with bla.$system.default
 2022-02-24 21:16:58 +01:00
Eelco Dolstra cf7f98483a
Merge pull request #6161 from edolstra/locked 
libfetchers: Rename immutable -> locked
 2022-02-24 19:01:33 +01:00
Eelco Dolstra 8518cebfce libfetchers: Rename immutable -> locked 
This is more consistent with flake terminology.
 2022-02-24 18:09:00 +01:00