github-actions[bot]
86f6902e73
Prepare release v0.37.0
2025-02-21 19:09:53 +00:00
Eelco Dolstra
bfc4745797
Merge pull request #56 from DeterminateSystems/stable-cli-in-manual
...
Mark the nix CLI as *the* interface in the manual, deprecate nix-*
2025-02-21 18:30:52 +00:00
Eelco Dolstra
f7aaa31978
Tweak title
2025-02-21 19:23:03 +01:00
Eelco Dolstra
247ec94041
Remove unnecessary ./.version-determinate symlink
2025-02-21 19:20:23 +01:00
Eelco Dolstra
a1d27ff6d2
Include Determinate Nix version number in the manual
2025-02-21 19:20:23 +01:00
Eelco Dolstra
69553dfc36
Mark the nix CLI as *the* interface in the manual, deprecate nix-*
2025-02-21 19:20:23 +01:00
Luc Perkins
a48757359a
Merge pull request #55 from DeterminateSystems/remove-sidebar-release-notes
...
Include only 2.26 in the sidebar release notes
2025-02-21 17:51:34 +00:00
Luc Perkins
d6bd787e5e
s/releases notes/release notes
2025-02-21 12:45:39 -05:00
Luc Perkins
e77d1a760e
Fix release notes version list
2025-02-21 12:38:05 -05:00
Luc Perkins
2f70d15f7f
Use /latest URL rather than version specific
2025-02-21 12:36:08 -05:00
Luc Perkins
8caa66b492
Fix merge conflict in template
2025-02-21 12:35:09 -05:00
Luc Perkins
2f64b0ff10
Provide external link instead of internal release notes link
2025-02-21 12:30:42 -05:00
Luc Perkins
b9e654819a
Include only 2.26 in the sidebar release notes
2025-02-21 12:26:28 -05:00
Eelco Dolstra
85077c8a5e
Merge pull request #54 from DeterminateSystems/detsys-release-notes
...
Fix Detsys Nix manual, add release notes
2025-02-21 17:16:45 +00:00
Eelco Dolstra
237c9bda79
Add release notes for 1.0.0
2025-02-21 13:27:21 +01:00
Eelco Dolstra
3f59f80e6c
Fix location of release-notes-determinate
2025-02-21 13:07:37 +01:00
Eelco Dolstra
5a647b670c
Merge pull request #44 from DeterminateSystems/build-manual
...
Build the Nix manual in CI
2025-02-21 01:21:00 +00:00
Eelco Dolstra
dece94fe25
Restrict permissions
2025-02-21 02:12:41 +01:00
Eelco Dolstra
53c03a0161
Cleanup
2025-02-21 01:50:42 +01:00
Eelco Dolstra
c23a2cdc4a
Hack
2025-02-21 01:43:22 +01:00
Graham Christensen
90e355784c
Merge pull request #51 from DeterminateSystems/graham/fh-634-spaghetti-deploy
...
Initial cut of propose-release / release workflows
2025-02-21 00:40:47 +00:00
Eelco Dolstra
0dc5b249ff
Build the Nix manual in CI and deploy to Netlify
2025-02-21 00:23:30 +01:00
Graham Christensen
592994d2e1
Fixup the release workflow
2025-02-20 17:15:51 -05:00
Graham Christensen
013c09948e
Create an initial propose-release workflow
2025-02-20 17:13:19 -05:00
Eelco Dolstra
b6101aedb4
Merge pull request #49 from DeterminateSystems/use-blacksmith
...
Run some jobs on blacksmith
2025-02-20 20:43:52 +00:00
Eelco Dolstra
835b3b4efe
Fix vm_tests_all
2025-02-20 21:39:01 +01:00
Eelco Dolstra
3e39ac4fc9
Don't run vm_tests_smoke in the merge queue
2025-02-20 21:06:17 +01:00
Eelco Dolstra
10977365ff
Run some jobs on blacksmith
2025-02-20 21:03:49 +01:00
Eelco Dolstra
9620c840cf
Merge pull request #48 from DeterminateSystems/run-all-vm-tests
...
Run all of hydraJobs.tests.*
2025-02-20 19:43:24 +00:00
Eelco Dolstra
4c39f29a4a
Move more stuff to the merge queue
2025-02-20 20:33:01 +01:00
Eelco Dolstra
d9f742302e
Add merge queue config
2025-02-20 20:24:51 +01:00
Eelco Dolstra
856afa27c2
Build the binary tarball
2025-02-20 17:22:42 +01:00
Eelco Dolstra
a691dcf48f
Run all of hydraJobs.tests.*
2025-02-20 16:08:07 +01:00
Eelco Dolstra
7202f11c74
Merge pull request #47 from DeterminateSystems/test-on-x86_64-darwin
...
Test on x86_64-darwin
2025-02-19 10:41:04 +01:00
Eelco Dolstra
0339ba582e
magic-nix-cache-action -> flakehub-cache-action
2025-02-19 09:09:57 +01:00
Eelco Dolstra
eabca75d0c
Test on x86_64-darwin
2025-02-19 00:52:32 +01:00
Eelco Dolstra
9810098740
Merge pull request #46 from DeterminateSystems/sync-2.26.2
...
Sync with Nix 2.26.2
2025-02-19 00:48:57 +01:00
Eelco Dolstra
a3cd93749f
Fix flake-regression dependency
2025-02-19 00:26:06 +01:00
Eelco Dolstra
ed4aeb4875
Fix hydraJobs.tests.functional_user
2025-02-19 00:26:06 +01:00
Eelco Dolstra
6c61d0ab8c
Formatting
2025-02-19 00:26:06 +01:00
Eelco Dolstra
4055239936
Tagging release 2.26.2
...
-----BEGIN PGP SIGNATURE-----
iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmetA5oTHGVkb2xzdHJh
QGdtYWlsLmNvbQAKCRCBcLRybXGY3g2pB/9JAFyjmaXuccbMTO/6x9qwsWuuXNLk
OQWzfbdUekvsihZZSFZg1r7KqqXHCi64f0nxLPsJ/0oeDWZktJ5KnbV630nuUlDj
ulLCpKdvhWFa8dVx9LiziGwQw4KLx8PjOfwThtQ4DqCWxWEmu6lKkijag9cE+ai4
3mw9YtUjBRxlXyhYLzWz3whLbv37c/m+R8iGS8xm8W260pmei6D0beOIPdfXYBQF
PzPlPORyI08A06uqyA3z7bTxzmSMnzvu0QInCPCKSHzFUnTZPHUYuYStFl28NrZS
fXKK59L0G7QEfdTRAmqQkdHdtPj2RlYFiMN0kQiNLflvKfGGWdi/kvdx
=rRix
-----END PGP SIGNATURE-----
Merge tag '2.26.2' into sync-2.26.2
Tagging release 2.26.2
2025-02-18 19:57:51 +01:00
mergify[bot]
b3e9204833
Merge pull request #12459 from NixOS/mergify/bp/2.26-maintenance/pr-12458
...
lockFlake(): When refetching a locked flake, use the locked ref (backport #12458 )
2025-02-12 16:09:58 +00:00
Eelco Dolstra
0ff190107f
Resolve merge conflict
2025-02-12 16:54:48 +01:00
Eelco Dolstra
dffcc184d7
lockFlake(): When refetching a locked flake, use the locked ref
...
Otherwise we may accidentally update a lock when we shouldn't.
Fixes #12445 .
(cherry picked from commit 5c552b62fc
2025-02-12 15:46:52 +00:00
Eelco Dolstra
49f226e87b
Merge pull request #12457 from NixOS/mergify/bp/2.26-maintenance/pr-12450
...
packaging/components.nix: Don't import a symlink (backport #12450 )
2025-02-12 12:56:51 +01:00
Eelco Dolstra
d308228497
Don't import a symlink
...
This is a workaround to avoid differing evaluation results between Nix
2.19 and >= 2.20 (#12449 ).
(cherry picked from commit 2e20a5f822
2025-02-12 11:42:49 +00:00
Eelco Dolstra
dfbd030d3f
Merge pull request #12453 from NixOS/mergify/bp/2.26-maintenance/pr-12448
...
copyPathToStore(): Preserve symlinks (backport #12448 )
2025-02-11 23:16:31 +01:00
Eelco Dolstra
83306bb841
copyPathToStore(): Preserve symlinks
...
E.g. in a derivation attribute `foo = ./bar`, if ./bar is a symlink,
we should copy the symlink to the store, not its target. This restores
the behaviour of Nix <= 2.19.
(cherry picked from commit 26b87e78b5
2025-02-11 21:51:39 +00:00
mergify[bot]
4c3786dd40
Merge pull request #12436 from NixOS/mergify/bp/2.26-maintenance/pr-12373
...
pre-commit/check-merge-conflicts-2: fix use outside dev shell (backport #12373 )
2025-02-10 15:15:29 +00:00
Robert Hensing
0531f1299c
Resolve conflict
2025-02-10 16:01:13 +01:00
