aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-04Merge pull request #9131 from obsidiansystems/delete-bootstrap-scripteldritch horrors
Get rid of `bootstrap.sh` (cherry picked from commit aaef47a08eaf54a8856dd25c784fd85d8d7b0e22) Change-Id: I1a74bed0c23d6fda06d5dfd8ecad443b9122da12
2024-03-04Merge pull request #8895 from hercules-ci/gc-before-statseldritch horrors
eval: Run a full GC before printing stats (cherry picked from commit aeea49609be014b1928c95b7ec28dbedeb4f032a) Change-Id: I47a23d3a7a47ea61d9a2b5727b638f879f3aaf1e
2024-03-04Merge pull request #9106 from Ericson2314/positive-source-filteringeldritch horrors
Use positive source filtering for the standalone functional tests job and Perl bindings (cherry picked from commit 6b6bd9003062c86a49d4384381941cf57f269c45) Change-Id: I896be67654f893d543ed6beb5d0d0d6c6d36e027
2024-03-04Merge pull request #8905 from hercules-ci/no-unknown-locationeldritch horrors
Don't print unknown locations unless requested for dev purposes (cherry picked from commit 3dd4475826dff8052fef42d4600b61e6b91950ac) Change-Id: I04a91277d1d9d09f5c1bf4a28fc99f0702b161e5
2024-03-04Merge pull request #9096 from NixOS/dont-rebuild-twice-on-cieldritch horrors
Don't run the tests that require building if we're not building (cherry picked from commit 8cfa582f436db8066eff74cb084990367e014ce6) Change-Id: I6085ca6107349669407340d7a5e52639a2febc90
2024-03-04Merge pull request #9098 from obsidiansystems/test-protoeldritch horrors
Enable most of the third `BuildResult` worker protocol test (cherry picked from commit d344c112f772282bacacd4c66a75df4022d16e12) Change-Id: I7b2b72aa84c19a6069f9c12128d901262db6f91c
2024-03-04Merge pull request #9094 from obsidiansystems/test-protoeldritch horrors
Test the rest of the worker protocol serializers (cherry picked from commit 2f1c16dfa2378fd8616bff1b9b7cd0b4d42af69b) Change-Id: Idfd72d32b21d14a260e02f65531d287cef7464d2
2024-03-04Merge pull request #9056 from aakropotkin/patch-1eldritch horrors
Respect `NOCOLOR` (cherry picked from commit 4b78a66bc5066fab46b4c84a5b85c3839e9d8aab) Change-Id: I005a13dea6cb33133f7bc59926cbaf5cf51c561a
2024-03-04Merge pull request #8923 from obsidiansystems/test-protoeldritch horrors
Unit test some worker protocol serializers (cherry picked from commit c6faef61a6f31c71146aee5d88168e861df9a22a) Change-Id: I99e36f5f17eb7642211a4e42a16b143424f164b4
2024-03-04Merge pull request #9041 from trofi/profiles-signeldritch horrors
src/libstore/profiles.cc: fix comparison of sign difference (cherry picked from commit 1da1642527f73089947b7bd2de46147a44700ac8) Change-Id: I8f23d32ad66b797ff58eb2bd15b2f7741f47cd99
2024-03-04Merge pull request #8887 from obsidiansystems/bsd-cross-ciJohn Ericson
Support cross compiling to BSD and CI it (cherry picked from commit 1f3fc08c5994ca69c84c9e745d59ec2bb2fd820a) Change-Id: I415e92952afc661cfb5ef91a76c0637678a04a19
2024-03-04Merge pull request #9029 from inclyc/users/lyc/pass-value-2Eelco Dolstra
libexpr: const rvalue reference -> value for nix::Expr nodes (cherry picked from commit de99647b9c66219b2e7bc698a62377cc4f6148f6) Change-Id: I96baf96b0a17e401548a926a7015f85e11d7c459
2024-03-04Merge pull request #8931 from fricklerhandwerk/nix3-config-optionsThéophane Hufschmitt
do not show configuration override flags for each command (cherry picked from commit f89b84919c1a5c796512c50311821e7779b3678b) Change-Id: Ib98b739bd6c9a1e94f94a78a47d84d72e435e7c0
2024-02-22Fix bad_format_string error when builder stdout contains % (#10063)github-actions[bot]
(cherry picked from commit e2b6821ca0147f36bcb9404aab080f80746984c8) Co-authored-by: roblabla <unfiltered@roblab.la>
2024-02-15Merge pull request #10018 from NixOS/fix-18-buildEelco Dolstra
[2.18] Fix the build
2024-02-15Fix the buildThéophane Hufschmitt
bef68e53b9d08c99873a5bc60568b7351934ad51 (backport of 31ebc6028b3682969d86a7b39ae87131c41cc604) accidentally broke the build because of a change in the constructor of `SourcePath` between 2.18 and master. Fix that.
2024-02-07fix location of `_redirects` file (#9956)github-actions[bot]
2024-01-22Merge pull request #9827 from NixOS/backport-9363-to-2.18-maintenanceEelco Dolstra
[Backport 2.18-maintenance] Fix symlink handling
2024-01-21Fix symlink handlingEelco Dolstra
This restores the symlink handling behaviour prior to 94812cca98fbb157e5f64a15a85a2b852d289feb. Fixes #9298. (cherry picked from commit 31ebc6028b3682969d86a7b39ae87131c41cc604)
2024-01-11Merge pull request #9738 from shlevy/ifd-buildStore-2.18John Ericson
(Backport #9661) Build IFD in the build store when using eval-store.
2024-01-11Merge branch '2.18-maintenance' into ifd-buildStore-2.18Shea Levy
2024-01-11Build IFD in the build store when using eval-store.Shea Levy
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 c3942ef85ffbd83391410fbf012f1de366d2463c)
2024-01-11remote-store test: Break out IFD expression into a separate fileShea Levy
(cherry picked from commit 9cb287657bec5a969d8bb1678d598d9fa820e60b)
2024-01-08fix an old lost direct (#9717)github-actions[bot]
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>
2023-12-05Merge pull request #9543 from NixOS/backport-9542-to-2.18-maintenanceJohn Ericson
[Backport 2.18-maintenance] Add missing `-pthread` for test support libraries
2023-12-05Add missing `-pthread` for test support librariesJohn Ericson
This is good in general (see how the other libraries also have long had it, since 49fe9592a47e7819179c2de4fd6068e897e944c7) but in particular needed to fix the NetBSD build. (cherry picked from commit b23273f6a29c725646b3523b1c35a0ae4a84ef61)
2023-12-01Merge pull request #9517 from NixOS/2.18-flatten-testsJohn Ericson
[Backport 2.18-maintanence] Backport test source layout reorgs
2023-12-01Move tests to separate directories, and documentJohn Ericson
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 91b6833686a6a6d9eac7f3f66393ec89ef1d3b57) (cherry picked from commit a61e42adb528b3d40ce43e07c79368d779a8b624)
2023-12-01Put functional tests in `tests/functional`John Ericson
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 68c81c737571794f7246db53fb4774e94fcf4b7e)
2023-12-01Merge pull request #9514 from NixOS/2.18-nixpkgs-bumpJohn Ericson
[Backport 2.18-maintainence] nixpkgs bump
2023-12-01flake.lock: UpdateRobert Hensing
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 fe4f573d49a5c47cf9ffd0bd3fe8868104550818) (cherry picked from commit f01baf5f0657ce58c9c14d7ab5de910f58e423c
2023-11-27Merge pull request #9471 from NixOS/backport-9459-to-2.18-maintenanceRobert Hensing
[Backport 2.18-maintenance] add path based redirects
2023-11-27add path based redirectsValentin Gagarin
up to now, those were managed outside of this repo, which as unsurprisingly a real hassle to deal with if one wanted to prevent URLs from breaking when moving pages around. this change removes a large part of the friction involved in moving content in the Nix manual. possible next steps for further automation: - check for content that moved and warn if it's not reachable from links that were valid prior to a change - create redirect rules automatically based on this information (cherry picked from commit 2b7016cc56d12e67de9f1f25b18311866a26a5fe)
2023-11-22Merge pull request #9436 from NixOS/backport-9431-to-2.18-maintenanceJohn Ericson
[Backport 2.18-maintenance] Add missing `-lrapidcheck` fixing build with shared lib
2023-11-22Add missing `-lrapidcheck` fixing build with shared libJohn Ericson
https://github.com/NixOS/nixpkgs/pull/269064 makes rapidcheck be build as a shared lib, but that broke Nix because the `-lrapidcheck` was missing. This fixes that (and doesn't break Nix what the library is a static archive as today). (cherry picked from commit 46131567da96ffac298b9ec54016b37114b0dfd5)
2023-11-20Merge pull request #9406 from NixOS/backport-9390-to-2.18-maintenanceThéophane Hufschmitt
[Backport 2.18-maintenance] fetchTree: clarify docs for shallow flag
2023-11-20fetchTree: clarify docs for shallow flagDavHau
(cherry picked from commit 796a7eb92d2b0caf75685126adc7460a4c39cfec)
2023-11-16Merge pull request #9366 from NixOS/backport-9187-to-2.18-maintenanceRobert Hensing
[2.18-maintenance] Backport #9187 apple-virt
2023-11-16libstore: Add apple-virt to system features when availableRobert Hensing
I'm sure that we'll adjust the implementation over time, but this at least discerns between an apple silicon bare metal machine and a tart VM. (cherry picked from commit 9277eb276bf0a942e88fcf499f6a6b9c262be853)
2023-11-16Merge pull request #9334 from fricklerhandwerk/backport-2.18-fix-anchorsEelco Dolstra
backport fix for the `--help` output to 2.18
2023-11-10backport fix for the `--help` outputValentin Gagarin
2023-10-09Merge pull request #9122 from NixOS/backport-9095-to-2.18-maintenanceJohn Ericson
[Backport 2.18-maintenance] StorePath: reject names starting with '.'
2023-10-08StorePath: reject names starting with '.'edef
This has been the behaviour before Nix 2.4. It was dropped in a rewrite in 759947bf72c134592f0ce23d385e48095bd0a301, allowing the creation of store paths that aren't considered valid by older Nix versions or other Nix tooling. Nix 2.4 didn't ship in NixOS until 22.05, and stdenv.mkDerivation in nixpkgs drops leading periods since April 2022, so it's unlikely anyone is relying on the current lax behaviour. Closes #9091. Change-Id: I4a57bd9899e1b0dba56870ae5a1b680918a18ce9 (cherry picked from commit 24bda0c7b381e1a017023c6f7cb9661fae8560bd)
2023-10-02Merge pull request #9086 from NixOS/backport-9081-to-2.18-maintenanceEelco Dolstra
[Backport 2.18-maintenance] Revert "Adapt scheduler to work with dynamic derivations"
2023-10-02Revert "Adapt scheduler to work with dynamic derivations"John Ericson
This reverts commit 5e3986f59cb58f48186a49dcec7aa317b4787522. This un-implements RFC 92 but fixes the critical bug #9052 which many people are hitting. This is a decent stop-gap until a minimal reproduction of that bug is found and a proper fix can be made. Mostly fixed #9052, but I would like to leave that issue open until we have a regression test, so I can then properly fix the bug (unbreaking RFC 92) later. (cherry picked from commit 8440afbed756254784d9fea3eaab06649dffd390)
2023-10-02Merge pull request #9079 from hercules-ci/backport-9022-to-2.18-maintenanceEelco Dolstra
[Backport 2.18-maintenance] pathExists: isDir when endswith /.
2023-10-01pathExists: isDir when endswith /.Robert Hensing
(cherry picked from commit f8a3893e8d77ce4a6e23719a0b2d88464cb84b9c)
2023-09-25Merge pull request #9036 from NixOS/backport-9026-to-2.18-maintenanceEelco Dolstra
[Backport 2.18-maintenance] flake: complete update to 23.05
2023-09-25flake: complete update to 23.05Gerg-L
(cherry picked from commit f264d9ff0862277523a207c7afaed4894a40dc11)
2023-09-21Merge pull request #9009 from NixOS/backport-9008-to-2.18-maintenanceRobert Hensing
[Backport 2.18-maintenance] Re-enable systemd-nspawn test