puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
14962 commits 19 branches 0 tags 68 MiB
Commit graph

14962 commits

This branch
This branch
All branches
Author SHA1 Message Date
eldritch horrors 559a8c44c3 Merge pull request #6258 from obsidiansystems/gcc-bug-ergonomics 
Remove bug-avoiding `StoreConfig *` casts for settings

(cherry picked from commit e3febfcd53)
Change-Id: Ifeae276582fdbc781a38581df9de3da67a7e7bf9
 2024-03-04 05:24:33 +01:00
eldritch horrors 7ff1dca1fa Merge pull request #9247 from obsidiansystems/derivation-test-with-files 
Turn derivation unit tests into unit characterization tests

(cherry picked from commit a6e587923c)
Change-Id: Ia2a2e65aabfee8d5d52142b8fdaacbae4a27242c
 2024-03-04 05:21:10 +01:00
eldritch horrors 4206441a12 Merge pull request #9246 from trofi/clarify-builder-uid-exhaustion 
local-derivation-goal.cc: slightly clarify waiting message

(cherry picked from commit 232e236672)
Change-Id: Idd271d6921caba203db9971f27e156e533664935
 2024-03-04 05:19:38 +01:00
eldritch horrors 89e03988ec Merge pull request #9238 from tfc/small-improvements2 
Small improvements 2

(cherry picked from commit 1dc6a65d36)
Change-Id: I8ed573c496068c4a92f53c1caafa49da59d75967
 2024-03-04 05:18:05 +01:00
eldritch horrors 622b0e9428 Merge pull request #8965 from Artturin/bindfilesinchroot 
Bindmount files instead of hardlinking or copying to chroot

(cherry picked from commit 622191c2b5)
Change-Id: I278ec1baacdfa9044992b58fdec8f14d6d7d09ce
 2024-03-04 05:17:31 +01:00
eldritch horrors 8abb20390e Merge pull request #9229 from tfc/small-improvements 
Remove warnings, small improvements

(cherry picked from commit 5ac87a75dd)
Change-Id: I88349b6e954398dde83c845f42d41a9dd89ba9e0
 2024-03-04 05:16:42 +01:00
eldritch horrors ea10088703 Merge pull request #9216 from obsidiansystems/addDrvOutputDependencies-pre 
Add `builtins.addDrvOutputDependencies`

(cherry picked from commit a58d7f143e)
Change-Id: Ia5a1790bf29dfaf29287cc35cdae6b6d650e7a83
 2024-03-04 05:06:56 +01:00
eldritch horrors 032eff7f69 Merge pull request #8470 from ncfavier/shebang-single-quotes 
nix-shell: support single quotes in shebangs, fix whitespace parsing
(cherry picked from commit 3b99c62913)
Change-Id: I2a431b21c3467eefa1ef95d5a36d672f45b6937a
 2024-03-04 05:06:32 +01:00
eldritch horrors 7f590ea709 Merge pull request #6223 from obsidiansystems/worker-proto-with-version 
Give `nix daemon` and `nix-store --serve` protocols separate serializers with version info

(cherry picked from commit 8b68bbb777)
Change-Id: Ia3d3b9fbaf9f0ae62ab225020b7d14790e793655
 2024-03-04 04:59:31 +01:00
eldritch horrors 4d9dde15ef Merge pull request #9191 from tfc/libutil-implementation 
libutil: Small improvements
(cherry picked from commit edc07588ec)
Change-Id: I01a481d872d859b372a4bade9bebd3dab2fb4efb
 2024-03-04 04:47:18 +01:00
Robert Hensing ab40b2c5d0 Merge pull request #9157 from obsidiansystems/protocol-versions 
Add protocol versions to `{Worker,Serve}Proto::*Conn`

(cherry picked from commit 4d17c59d8d)
Change-Id: I497af39deb792e50c157a1305d8c9e722798740b
 2024-03-04 04:43:35 +01:00
eldritch horrors 5ddd1a9166 Merge pull request #9168 from obsidiansystems/fix-lang-tests-read-only 
Fix language tests a bit

(cherry picked from commit e92cac789f)
Change-Id: I527e94c5af0921ff2559ce5a4ac7635be791c22e
 2024-03-04 04:42:21 +01:00
eldritch horrors c0fa61340c Merge pull request #9172 from tfc/bad-moves 
Fix/remove some bad std::moves

(cherry picked from commit 8c049a9f04)
Change-Id: I720273378d2506a13883acee28abd096d099b0d4
 2024-03-04 04:41:52 +01:00
eldritch horrors 75fb953205 Merge pull request #9170 from tfc/fix-broken-move 
Fix broken move

(cherry picked from commit aa4f41d796)
Change-Id: I39d3f9f4f27328500de005c9205d905c55d6f9ea
 2024-03-04 04:40:51 +01:00
eldritch horrors d28a6618a8 Merge pull request #9167 from obsidiansystems/pre-overhaul-completions 
Improve tests and docs prior to refactoring completions

(cherry picked from commit 5442d9b472)
Change-Id: Ief99ac2cd9c92981a9a522d15b9c3daf99182c9d
 2024-03-04 04:38:33 +01:00
eldritch horrors 7d8b34475a Merge pull request #9152 from obsidiansystems/split-out-perl-nix 
Factor out Perl bindings Nix package

(cherry picked from commit d12c614ac7)
Change-Id: Ie75ccfec8cc815ea95ae9848cb03e33aa8cee5ae
 2024-03-04 04:37:44 +01:00
eldritch horrors e12e9f2452 Merge pull request #9137 from obsidiansystems/serve-protocol 
Introduce separate Serve protocol serialisers

(cherry picked from commit d070d8b746)
Change-Id: Ibcc8639e8997bcd07f7a5318330a147bcadc411b
 2024-03-04 04:37:05 +01:00
eldritch horrors aeb803de9a Merge pull request #8047 from lovesegfault/always-allow-substitutes 
feat: add always-allow-substitutes

(cherry picked from commit da2b59a088)
Change-Id: I50481cd8fe643c673c610fec28bad84519a4d650
 2024-03-04 04:37:03 +01:00
eldritch horrors 6897e238bd Merge pull request #9099 from obsidiansystems/common-proto 
Factor out bits of the worker protocol to use elsewhere

(cherry picked from commit 4b1a97338f)
Change-Id: If93afa0f8b1cf9b0e705b34fa71e6fd708752758
 2024-03-04 04:36:58 +01:00
eldritch horrors da0aa66d98 Merge pull request #9131 from obsidiansystems/delete-bootstrap-script 
Get rid of `bootstrap.sh`

(cherry picked from commit aaef47a08e)
Change-Id: I1a74bed0c23d6fda06d5dfd8ecad443b9122da12
 2024-03-04 04:36:52 +01:00
eldritch horrors 6feba52008 Merge pull request #8895 from hercules-ci/gc-before-stats 
eval: Run a full GC before printing stats

(cherry picked from commit aeea49609b)
Change-Id: I47a23d3a7a47ea61d9a2b5727b638f879f3aaf1e
 2024-03-04 04:36:47 +01:00
eldritch horrors fd1299cef3 Merge pull request #9106 from Ericson2314/positive-source-filtering 
Use positive source filtering for the standalone functional tests job and Perl bindings

(cherry picked from commit 6b6bd90030)
Change-Id: I896be67654f893d543ed6beb5d0d0d6c6d36e027
 2024-03-04 04:36:42 +01:00
eldritch horrors 4517de00cb Merge pull request #8905 from hercules-ci/no-unknown-location 
Don't print unknown locations unless requested for dev purposes

(cherry picked from commit 3dd4475826)
Change-Id: I04a91277d1d9d09f5c1bf4a28fc99f0702b161e5
 2024-03-04 04:36:38 +01:00
eldritch horrors c36ba796dd Merge pull request #9096 from NixOS/dont-rebuild-twice-on-ci 
Don't run the tests that require building if we're not building

(cherry picked from commit 8cfa582f43)
Change-Id: I6085ca6107349669407340d7a5e52639a2febc90
 2024-03-04 04:36:33 +01:00
eldritch horrors 7e966819b5 Merge pull request #9098 from obsidiansystems/test-proto 
Enable most of the third `BuildResult` worker protocol test

(cherry picked from commit d344c112f7)
Change-Id: I7b2b72aa84c19a6069f9c12128d901262db6f91c
 2024-03-04 04:36:28 +01:00
eldritch horrors ea0008deea Merge pull request #9094 from obsidiansystems/test-proto 
Test the rest of the worker protocol serializers

(cherry picked from commit 2f1c16dfa2)
Change-Id: Idfd72d32b21d14a260e02f65531d287cef7464d2
 2024-03-04 04:36:23 +01:00
eldritch horrors 8867479b27 Merge pull request #9056 from aakropotkin/patch-1 
Respect `NOCOLOR`

(cherry picked from commit 4b78a66bc5)
Change-Id: I005a13dea6cb33133f7bc59926cbaf5cf51c561a
 2024-03-04 04:36:19 +01:00
eldritch horrors f17e7b1855 Merge pull request #8923 from obsidiansystems/test-proto 
Unit test some worker protocol serializers

(cherry picked from commit c6faef61a6)
Change-Id: I99e36f5f17eb7642211a4e42a16b143424f164b4
 2024-03-04 04:36:14 +01:00
eldritch horrors 79dd9efe38 Merge pull request #9041 from trofi/profiles-sign 
src/libstore/profiles.cc: fix comparison of sign difference

(cherry picked from commit 1da1642527)
Change-Id: I8f23d32ad66b797ff58eb2bd15b2f7741f47cd99
 2024-03-04 04:36:10 +01:00
John Ericson bc4aa3d5db Merge pull request #8887 from obsidiansystems/bsd-cross-ci 
Support cross compiling to BSD and CI it

(cherry picked from commit 1f3fc08c59)
Change-Id: I415e92952afc661cfb5ef91a76c0637678a04a19
 2024-03-04 04:36:04 +01:00
Eelco Dolstra 2442a40393 Merge pull request #9029 from inclyc/users/lyc/pass-value-2 
libexpr: const rvalue reference -> value for nix::Expr nodes

(cherry picked from commit de99647b9c)
Change-Id: I96baf96b0a17e401548a926a7015f85e11d7c459
 2024-03-04 04:35:59 +01:00
Théophane Hufschmitt 68ba44c518 Merge pull request #8931 from fricklerhandwerk/nix3-config-options 
do not show configuration override flags for each command

(cherry picked from commit f89b84919c)
Change-Id: Ib98b739bd6c9a1e94f94a78a47d84d72e435e7c0
 2024-03-04 04:35:54 +01:00
github-actions[bot] afb55f36df
Fix bad_format_string error when builder stdout contains % (#10063) 
(cherry picked from commit e2b6821ca0)

Co-authored-by: roblabla <unfiltered@roblab.la>
 2024-02-22 23:12:29 +01:00
Eelco Dolstra 2a6a7aad3f
Merge pull request #10018 from NixOS/fix-18-build 
[2.18] Fix the build
 2024-02-15 11:00:13 +01:00
Théophane Hufschmitt f36d4aefd3 Fix the build 
bef68e53b9 (backport of
31ebc6028b) accidentally broke the build
because of a change in the constructor of `SourcePath` between 2.18 and
master. Fix that.
 2024-02-15 09:50:12 +01:00
github-actions[bot] 2db5c5326b
fix location of _redirects file (#9956) 2024-02-07 11:44:06 +01:00
Eelco Dolstra 5f7f68e0a8
Merge pull request #9827 from NixOS/backport-9363-to-2.18-maintenance 
[Backport 2.18-maintenance] Fix symlink handling
 2024-01-22 14:30:17 +01:00
Eelco Dolstra bef68e53b9 Fix symlink handling 
This restores the symlink handling behaviour prior to
94812cca98.

Fixes #9298.

(cherry picked from commit 31ebc6028b)
 2024-01-21 20:53:30 +00:00
John Ericson 60eb80593f
Merge pull request #9738 from shlevy/ifd-buildStore-2.18 
(Backport #9661) Build IFD in the build store when using eval-store.
 2024-01-11 10:06:20 -05:00
Shea Levy ba48ab4b95
Merge branch '2.18-maintenance' into ifd-buildStore-2.18 2024-01-11 07:21:16 -05:00
Shea Levy e7c2b35827
Build IFD in the build store when using eval-store. 
Previously, IFDs would be built within the eval store, even though one
is typically using `--eval-store` precisely to *avoid* local builds.

Because the resulting Nix expression must be copied back to the eval
store in order to be imported, this requires the eval store to trust
the build store's signatures.

(cherry picked from commit c3942ef85f)
 2024-01-11 06:34:27 -05:00
Shea Levy be208d8e78
remote-store test: Break out IFD expression into a separate file 
(cherry picked from commit 9cb287657b)
 2024-01-11 06:30:02 -05:00
github-actions[bot] 4dd5171652
fix an old lost direct (#9717) 
this part must have been moved quite a while ago, but apparently so far
no one noticed

(cherry picked from commit 6db805b3d1e4eccd0103d9856b8ab3d01efba51f)

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
 2024-01-08 20:57:39 +01:00
John Ericson 4a1c3762df
Merge pull request #9543 from NixOS/backport-9542-to-2.18-maintenance 
[Backport 2.18-maintenance] Add missing `-pthread` for test support libraries
 2023-12-05 19:26:18 -05:00
John Ericson 615bd655e5 Add missing -pthread for test support libraries 
This is good in general (see how the other libraries also have long had
it, since 49fe9592a4) but in particular
needed to fix the NetBSD build.

(cherry picked from commit b23273f6a2)
 2023-12-05 23:44:41 +00:00
John Ericson 211b6e1855
Merge pull request #9517 from NixOS/2.18-flatten-tests 
[Backport 2.18-maintanence] Backport test source layout reorgs
 2023-12-01 13:53:13 -05:00
John Ericson f7f37035c8 Move tests to separate directories, and document 
Today, with the tests inside a `tests` intermingled with the
corresponding library's source code, we have a few problems:

- We have to be careful that wildcards don't end up with tests being
  built as part of Nix proper, or test headers being installed as part
  of Nix proper.

- Tests in libraries but not executables is not right:

  - It means each executable runs the previous unit tests again, because
    it needs the libraries.

  - It doesn't work right on Windows, which doesn't want you to load a
    DLL just for the side global variable . It could be made to work
    with the dlopen equivalent, but that's gross!

This reorg solves these problems.

There is a remaining problem which is that sibbling headers (like
`hash.hh` the test header vs `hash.hh` the main `libnixutil` header) end
up shadowing each other. This PR doesn't solve that. That is left as
future work for a future PR.

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>

(cherry picked from commit 91b6833686)
(cherry picked from commit a61e42adb528b3d40ce43e07c79368d779a8b624)
 2023-12-01 13:05:03 -05:00
John Ericson 30dcc19d1f Put functional tests in tests/functional 
I think it is bad for these reasons when `tests/` contains a mix of
functional and integration tests

 - Concepts is harder to understand, the documentation makes a good
   unit vs functional vs integration distinction, but when the
   integration tests are just two subdirs within `tests/` this is not
   clear.

 - Source filtering in the `flake.nix` is more complex. We need to
   filter out some of the dirs from `tests/`, rather than simply pick
   the dirs we want and take all of them. This is a good sign the
   structure of what we are trying to do is not matching the structure
   of the files.

With this change we have a clean:
```shell-session
$ git show 'HEAD:tests'
tree HEAD:tests

functional/
installer/
nixos/
```

(cherry picked from commit 68c81c7375)
 2023-12-01 12:06:43 -05:00
John Ericson 7242521265
Merge pull request #9514 from NixOS/2.18-nixpkgs-bump 
[Backport 2.18-maintainence] nixpkgs bump
 2023-12-01 11:30:05 -05:00
Robert Hensing 016f936df6 flake.lock: Update 
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/31ed632c692e6a36cfc18083b88ece892f863ed4' (2023-09-21)
  → 'github:NixOS/nixpkgs/9ba29e2346bc542e9909d1021e8fd7d4b3f64db0' (2023-11-23)

(cherry picked from commit fe4f573d49)
(cherry picked from commit f01baf5f0657ce58c9c14d7ab5de910f58e423c
 2023-12-01 11:08:15 -05:00