aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
2023-09-20Re-enable systemd-nspawn testCole Helbling
It was disabled in c6953d1ff62fb6dc4fbd89c03e7949c552c19382 because a recent Nixpkgs bump brought in a new systemd which changed how systemd-nspawn worked. As far as I can tell, the issue was caused by this upstream systemd commit: https://github.com/systemd/systemd/commit/b71a0192c040f585397cfc6fc2ca025bf839733d Bind-mounting the host's `/sys` and `/proc` into the container's `/run/host/{sys,proc}` fixes the issue and allows the test to succeed. (cherry picked from commit 883092e3f78d4efb1066a2e24e343b307035a04c)
2023-09-20Bump versionEelco Dolstra
2023-09-20Mark official releaseEelco Dolstra
2023-09-20Merge pull request #9002 from NixOS/release-notesEelco Dolstra
Release notes
2023-09-20Release notesEelco Dolstra
2023-09-20Merge pull request #8991 from ↵Eelco Dolstra
NixOS/dependabot/github_actions/docker/login-action-3 Bump docker/login-action from 2 to 3
2023-09-20Merge pull request #8569 from vcunat/p/flake-updateEelco Dolstra
flake: update nixpkgs: 22.11 -> 23.05
2023-09-19Use "touch -h"Eelco Dolstra
https://hydra.nixos.org/build/235888160 This is needed because Nixpkgs now contains dangling symlinks (pkgs/test/nixpkgs-check-by-name/tests/symlink-invalid/pkgs/by-name/fo/foo/foo.nix).
2023-09-19Disable systemd-nspawn testEelco Dolstra
This is broken because of a change in systemd in NixOS 23.05. It fails with Failed to mount proc (type proc) on /proc (MS_NOSUID|MS_NODEV|MS_NOEXEC ""): Operation not permitted
2023-09-19Disable rapidcheck tests in the coverage runEelco Dolstra
https://hydra.nixos.org/build/233688539
2023-09-19Try aws-sdk-cpp fixEelco Dolstra
2023-09-19Merge remote-tracking branch 'origin/master' into p/flake-updateEelco Dolstra
2023-09-18Bump docker/login-action from 2 to 3dependabot[bot]
Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
2023-09-14Merge pull request #7661 from henrik-ch/repl-docThéophane Hufschmitt
improved help command listing.
2023-09-13Merge pull request #8959 from maralorn/print-parentThéophane Hufschmitt
Print parent activity field in json log
2023-09-12docs: make the nix develop --command example unambiguous (#8952)Emil Nikolov
2023-09-11Merge pull request #8962 from mkenigs/dead-codeJohn Ericson
Drop dead code
2023-09-10Drop dead codeMatthew Kenigsberg
localPath is unused
2023-09-09Print parent activity field in json logmaralorn
2023-09-09docs: fixed the default priority of nix-env --install (#8945)Emil Nikolov