Commit Graph
19011 Commits
Author SHA1 Message Date
Jörg ThalheimandGitHub 0f8e80f292 Merge pull request #276 from nix-community/joerg-ci
bump to 2.19.0
2023-12-06 09:56:32 +01:00
Jörg Thalheim 6f9a8d2cda bump to 2.19.0 2023-12-06 09:41:01 +01:00
Jörg Thalheimandmergify[bot] d4eeecf6b2 fix commandline parsing for nix 2.19 2023-12-06 08:30:10 +00:00
Jörg Thalheimandmergify[bot] c240e61481 fix missing includes for nix 2.19 2023-12-06 08:30:10 +00:00
Jörg Thalheimandmergify[bot] 34110992a8 flake.lock: Update
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/8c9fa2545007b49a5db5f650ae91f227672c3877' (2023-11-01)
  → 'github:hercules-ci/flake-parts/34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5' (2023-12-01)
• Updated input 'nix-github-actions':
    'github:nix-community/nix-github-actions/4bb5e752616262457bc7ca5882192a564c0472d2' (2023-11-03)
  → 'github:nix-community/nix-github-actions/93e39cc1a087d65bcf7a132e75a650c44dd2b734' (2023-11-28)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/5171694860f185961daff3b1b413dabcab421300' (2023-11-27)
  → 'github:NixOS/nixpkgs/9ed8ade77aef706a03d8cc3a5ad4f60848ac59a7' (2023-12-06)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/e82f32aa7f06bbbd56d7b12186d555223dc399d1' (2023-11-12)
  → 'github:numtide/treefmt-nix/affe7fc3f5790e1d0b5ba51bcff0f7ebe465e92d' (2023-12-04)
2023-12-06 08:30:10 +00:00
John EricsonandGitHub 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 Ericsonandgithub-actions[bot] 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 b23273f6a29c725646b3523b1c35a0ae4a84ef61)
2023-12-05 23:44:41 +00:00
John EricsonandGitHub 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 91b6833686a6a6d9eac7f3f66393ec89ef1d3b57)
(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 68c81c737571794f7246db53fb4774e94fcf4b7e)
2023-12-01 12:06:43 -05:00
John EricsonandGitHub 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 HensingandJohn Ericson 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 fe4f573d49a5c47cf9ffd0bd3fe8868104550818)
(cherry picked from commit f01baf5f0657ce58c9c14d7ab5de910f58e423c
2023-12-01 11:08:15 -05:00
renovate[bot]andmergify[bot] 608089054e chore(deps): update cachix/install-nix-action action to v24 2023-11-28 18:11:31 +00:00
Robert HensingandGitHub 083b198bb7 Merge pull request #9471 from NixOS/backport-9459-to-2.18-maintenance
[Backport 2.18-maintenance] add path based redirects
2023-11-27 15:15:52 +01:00
Valentin Gagarinandgithub-actions[bot] 8fb477a6e7 add path based redirects
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-27 13:29:00 +00:00
renovate[bot]andmergify[bot] e543721cff chore(deps): lock file maintenance 2023-11-27 00:57:07 +00:00
John EricsonandGitHub 05b7e2dc57 Merge pull request #9436 from NixOS/backport-9431-to-2.18-maintenance
[Backport 2.18-maintenance] Add missing `-lrapidcheck` fixing build with shared lib
2023-11-22 09:35:24 -05:00
John Ericsonandgithub-actions[bot] 89a66633b7 Add missing -lrapidcheck fixing build with shared lib
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-22 04:48:11 +00:00
Théophane HufschmittandGitHub fadad86276 Merge pull request #9406 from NixOS/backport-9390-to-2.18-maintenance
[Backport 2.18-maintenance] fetchTree: clarify docs for shallow flag
2023-11-20 15:38:25 +01:00
DavHauandgithub-actions[bot] 23775b7364 fetchTree: clarify docs for shallow flag
(cherry picked from commit 796a7eb92d2b0caf75685126adc7460a4c39cfec)
2023-11-20 14:16:03 +00:00
Jörg ThalheimandGitHub 575ca7a957 Merge pull request #268 from nix-community/joerg-ci
README: mention nix-fast-build and buildbot-nix
2023-11-20 06:51:25 +01:00
Jörg Thalheim 70786f5ff4 fix mergify for normal non-bot merges 2023-11-20 06:50:56 +01:00
Jörg Thalheim 354fd8b93d README: mention nix-fast-build and buildbot-nix 2023-11-20 06:48:59 +01:00
renovate[bot]andmergify[bot] 7ee77ecd80 chore(deps): lock file maintenance 2023-11-20 02:28:57 +00:00
adisbladisandGitHub c706391bd1 Merge pull request #269 from nix-community/renovate/lock-file-maintenance
chore(deps): lock file maintenance
2023-11-20 15:19:54 +13:00
Robert HensingandGitHub 8e72a529da Merge pull request #9366 from NixOS/backport-9187-to-2.18-maintenance
[2.18-maintenance] Backport #9187 apple-virt
2023-11-16 19:44:32 +01:00
Robert Hensing af21431140 libstore: Add apple-virt to system features when available
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-16 18:59:06 +01:00
Eelco DolstraandGitHub 184a20ec04 Merge pull request #9334 from fricklerhandwerk/backport-2.18-fix-anchors
backport fix for the `--help` output to 2.18
2023-11-16 15:02:18 +01:00
renovate[bot]andmergify[bot] 333af7cb0f Lock file maintenance 2023-11-14 08:59:06 +00:00
mergify[bot]andGitHub d075183226 Merge branch 'main' into renovate/lock-file-maintenance 2023-11-14 08:50:32 +00:00
Jörg Thalheim 0cdb4f4c63 renovate: add dependencies label 2023-11-14 09:49:42 +01:00
adisbladisandGitHub ba5a08670c Merge pull request #267 from mightyiam/patch-1
Update README.md
2023-11-14 19:43:20 +13:00
Shahar "Dawn" OrandGitHub 9a456e0e72 Update README.md 2023-11-14 12:14:58 +07:00
renovate[bot]andGitHub 67b35acd0e Lock file maintenance 2023-11-13 01:58:28 +00:00
Jörg ThalheimandGitHub 213e801956 Merge pull request #264 from nix-community/release-2.18
Prepare next release
2023-11-12 14:35:51 +01:00
Jörg Thalheim 6ac0adcbb0 update version: 2.16.0 -> 2.18.0 2023-11-12 14:17:43 +01:00
Jörg Thalheim a53aaefbcc publish to flakestry 2023-11-12 14:17:19 +01:00
Jörg Thalheim cdbfafc2e6 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/0d93ec62e06faec6c52331a8a87bd5721b38ce14' (2023-11-06)
  → 'github:NixOS/nixpkgs/44cf4801c0937b76cc6f416a0b160b5d1b3286af' (2023-11-12)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/5deb8dc125a9f83b65ca86cf0c8167c46593e0b1' (2023-10-27)
  → 'github:numtide/treefmt-nix/e82f32aa7f06bbbd56d7b12186d555223dc399d1' (2023-11-12)
2023-11-12 14:11:00 +01:00
Valentin Gagarin a68bf15fe6 backport fix for the --help output 2023-11-10 19:22:42 +01:00
Jörg ThalheimandGitHub 2b55f473c9 Merge pull request #263 from nix-community/renovate/lock-file-maintenance
Lock file maintenance
2023-11-06 09:56:43 +01:00
renovate[bot]andGitHub 3fdf27e5df Lock file maintenance 2023-11-06 02:33:20 +00:00
adisbladisandGitHub 20a24e8b10 Merge pull request #260 from nix-community/no-garnix
CI: Garnix -> Github Actions
2023-11-04 14:11:17 +13:00
adisbladis 209f590412 Garnix -> Github Actions
It's much easier for forks to use GHA than it is to sign up for another proprietary service.
I was annoyed by this myself when I forked nix-eval-jobs to nix-unit.
2023-11-04 14:05:53 +13:00
adisbladis a64814310a update-flack-lock action -> renovate 2023-11-04 13:08:53 +13:00
adisbladisandmergify[bot] cb9c7cac6b Fix iterating over input derivation outputs 2023-11-03 03:07:37 +00:00
adisbladisandmergify[bot] 5ac2dd6281 Bump nixpkgs 2023-11-03 03:07:37 +00:00
adisbladisandmergify[bot] dd8affe264 Add missing include for eval-settings.hh 2023-11-03 03:07:37 +00:00
github-actions[bot]andmergify[bot] 783357db13 flake.lock: Update
Flake lock file updates:

• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4' (2023-10-03)
  → 'github:hercules-ci/flake-parts/8c9fa2545007b49a5db5f650ae91f227672c3877' (2023-11-01)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/18e505d654892d057f308c817d220faf962dbf23' (2023-10-19)
  → 'github:NixOS/nixpkgs/2c732a9b5a5a60d91c685c92b87db5b8f5cf5812' (2023-11-01)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/aae39f64f5ecbe89792d05eacea5cb241891292a' (2023-10-15)
  → 'github:numtide/treefmt-nix/5deb8dc125a9f83b65ca86cf0c8167c46593e0b1' (2023-10-27)
2023-11-03 03:07:37 +00:00
github-actions[bot]andmergify[bot] 01a606e119 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/21f56f3209c0272852be7a704d9b21f2601c72e3' (2023-10-16)
  → 'github:NixOS/nixpkgs/18e505d654892d057f308c817d220faf962dbf23' (2023-10-19)
2023-10-19 01:36:10 +00:00
github-actions[bot]andmergify[bot] bdf17c44b1 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/35c640b19a189ce3a86698ce2fdcd87d085a339b' (2023-10-09)
  → 'github:NixOS/nixpkgs/21f56f3209c0272852be7a704d9b21f2601c72e3' (2023-10-16)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/720bd006d855b08e60664e4683ccddb7a9ff614a' (2023-09-27)
  → 'github:numtide/treefmt-nix/aae39f64f5ecbe89792d05eacea5cb241891292a' (2023-10-15)
2023-10-16 01:08:40 +00:00