1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-06 21:41:48 +02:00
Commit graph

19377 commits

Author SHA1 Message Date
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)

# Conflicts:
#	src/libflake/flake/flake.cc
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
Robert Hensing
df8d5e61ad test: Fix shellcheck by giving git-hashing scripts shebangs
This seems to be the way to do it now, even though I can't run them
without setting at least one env var.
I'll only fix shellcheck for now. Don't shoot the messenger.

It isn't quite clear to me why the previous commit masked this problem,
but I'm glad shellcheck has an effect or more effect now.
2025-02-10 15:14:53 +01:00
Robert Hensing
30435e0559 pre-commit/check-merge-conflicts-2: fix use outside dev shell
Note that this is just a script that is meant to run outside a
derivation (but also can be called by a derivation builder).
`touch $out` does not belong in it.

`touch $out` worked accidentally in the derivation-based check,
and also in the dev shell, but if pre-commit is invoked without
the dev shell it would fail.
2025-02-10 15:14:44 +01:00
Eelco Dolstra
31bdb2a8ff
Merge pull request #12429 from NixOS/mergify/bp/2.26-maintenance/pr-12386
Git fetcher: Don't create refs when fetching by revision (backport #12386)
2025-02-06 15:24:14 +01:00
Eelco Dolstra
8e4cd2f537 readHead(): Make sure we're returning the HEAD ref line
If we previously fetched by revision, the output of "git ls-remote"
won't start with the expected line like

  ref: refs/heads/master HEAD

but will be something like

  5c4410e3b9891c05ab40d723de78c6f0be45ad30        refs/heads/5c4410e3b9891c05ab40d723de78c6f0be45ad30

This then causes Nix to treat that revision as a refname, which then
leads to warnings like

  warning: could not update cached head '5c4410e3b9891c05ab40d723de78c6f0be45ad30' for 'file:///tmp/repo'

(cherry picked from commit c8b22643ba)
2025-02-06 14:05:03 +00:00
Eelco Dolstra
1fe33c13d9 Git fetcher: Don't use refspec <rev>:<rev>
This causes Git to create a local ref named refs/head/<rev>, e.g.

  $ git -C ~/.cache/nix/gitv3/11irpim06vj4h6c0w8yls6kx4hvl0qd0gr1fvk47n76g6wf1s1vk ls-remote --symref .
  5c4410e3b9891c05ab40d723de78c6f0be45ad30        refs/heads/5c4410e3b9891c05ab40d723de78c6f0be45ad30
  7f6bde8a20de4cccc2256f088bc5af9dbe38881d        refs/heads/7f6bde8a20de4cccc2256f088bc5af9dbe38881d

which confuses readHead(), leading to errors like

  fatal: Refusing to point HEAD outside of refs/
  warning: could not update cached head 'd275d93aa0bb8a004939b2f1e87f559f989453be' for 'file:///tmp/repo'

(cherry picked from commit ee9fa0d360)
2025-02-06 14:05:03 +00:00
Eelco Dolstra
727cf59997 Git fetcher: Don't pass URL query parameters for file:// URLs
Git interprets them as part of the file name, so passing parameters
like 'rev' breaks. Only relevant for testing (when _NIX_FORCE_HTTP is
set) and local bare repos.

(cherry picked from commit 9f72d5bce9)
2025-02-06 14:05:02 +00:00
mergify[bot]
acba2c6f4f
Merge pull request #12406 from NixOS/mergify/bp/2.26-maintenance/pr-12405
nix-profile.fish: Typo NIX_SS{H => L}_CERT_FILE (backport #12405)
2025-02-03 12:50:41 +00:00