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

20255 commits

Author SHA1 Message Date
Eelco Dolstra
508b7a705f
Trigger flake_regressions from a label
Co-authored-by: Graham Christensen <graham@grahamc.com>
2025-05-08 18:12:58 +02:00
Eelco Dolstra
6023688c6c printValueAsJSON(): Don't devirtualize
This is already done by consumers of builtins.toJSON (like
builtins.toFile or builtins.derivation), so we can delay this until
it's actually needed.
2025-05-08 15:33:14 +02:00
Eelco Dolstra
2bbf755bee Handle FIXMEs 2025-05-07 21:36:13 +02:00
Eelco Dolstra
0f48a152dd Handle derivation 2025-05-07 20:56:41 +02:00
Eelco Dolstra
8739d35529 Fix tests/NixOS/nix/2.18.1 2025-05-07 19:22:14 +02:00
Eelco Dolstra
2a35d8f800 Add a special type of context for the result of toString
When you apply `builtins.toString` to a path value representing a path
in the Nix store (as is the case with flake inputs), historically you
got a string without context (e.g. `/nix/store/...-source`). This is
broken, since it allows you to pass a store path to a
derivation/toFile without a proper store reference. This is especially
a problem with lazy trees, since the store path is a virtual path that
doesn't exist and can be different every time.

For backwards compatibility, and to warn users about this unsafe use
of `toString`, we now keep track of such strings as a special type of
context.
2025-05-07 18:53:39 +02:00
Eelco Dolstra
8c568277fd Run flake-regressions 2025-05-07 18:24:45 +02:00
Eelco Dolstra
df93fa8604
Merge pull request #27 from DeterminateSystems/lazy-trees-v2
Lazy trees v2
2025-05-07 15:03:25 +00:00
Eelco Dolstra
f6ad6291ab nix flake metadata: Show store path if available 2025-05-07 15:56:35 +02:00
Eelco Dolstra
d0a89fa03f Put flake_regressions back in the merge queue 2025-05-07 15:30:13 +02:00
Eelco Dolstra
9bab483196 Improve error message
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2025-05-07 14:07:29 +02:00
Eelco Dolstra
91cde8c79d EvalState::mountInput(): Throw an error if there is a NAR hash mismatch 2025-05-07 14:07:29 +02:00
Eelco Dolstra
630bdff7e9 Re-enable _NIX_TEST_FAIL_ON_LARGE_PATH tests 2025-05-07 12:49:11 +02:00
Graham Christensen
8713cd6b64
Merge pull request #54 from DeterminateSystems/update-flake-lock
Update flake.lock in light of recent change
2025-05-06 20:50:18 +00:00
Graham Christensen
6d2eb418dc
Merge pull request #55 from DeterminateSystems/gustavderdrache/deprecate-upgrade
Deprecate upgrade-nix command
2025-05-06 20:19:29 +00:00
gustavderdrache
fb01b8c5c9 Nits: formatting 2025-05-06 15:30:33 -04:00
gustavderdrache
d4eb6059c9
Update src/nix/upgrade-nix.cc
Co-authored-by: Graham Christensen <graham@grahamc.com>
2025-05-06 15:11:34 -04:00
gustavderdrache
49da034ecd Deprecate upgrade-nix command 2025-05-06 15:05:34 -04:00
Luc Perkins
5a7555f4aa
Update flake.lock in light of recent change 2025-05-06 15:41:23 -03:00
Eelco Dolstra
6f5cfafe0d Run flake-regressions with --lazy-trees 2025-05-06 19:11:49 +02:00
Eelco Dolstra
577b331464 Merge remote-tracking branch 'detsys/detsys-main' into lazy-trees-v2 2025-05-06 19:09:09 +02:00
Eelco Dolstra
fef193fbc4 Try namespace runner 2025-05-06 18:42:32 +02:00
Eelco Dolstra
5ed4a92e9e
Merge pull request #52 from DeterminateSystems/remove-flake-compat
Remove flake-compat input
2025-05-06 16:30:53 +00:00
Luc Perkins
32b50f632f
Merge remote-tracking branch 'origin/detsys-main' into remove-flake-compat 2025-05-05 15:03:30 -03:00
Luc Perkins
d9839cc922
Remove flake-compat input 2025-05-05 14:15:20 -03:00
Graham Christensen
ac4db6d96d
Merge pull request #51 from DeterminateSystems/push-rlzmsvkzlzyo
Only run the test step after build completes
2025-05-05 15:30:54 +00:00
Graham Christensen
eea5988e6d Only run the test step after build completes
This prevents the test step from duplicating work from the build step.
This minimizes contention on our macOS build infra most significantly, but the others too.
2025-05-05 10:23:27 -04:00
Graham Christensen
56f3705891
Merge pull request #50 from DeterminateSystems/release-v3.4.2/01c8324d-8b00-437d-93d0-7b2275883c70
Release v3.4.2
2025-05-05 13:34:48 +00:00
github-actions[bot]
21ff15bb2e
Set .version-determinate to 3.4.2 2025-05-05 13:25:03 +00:00
github-actions[bot]
dc7d270df4
Prepare release v3.4.2 2025-05-05 13:24:57 +00:00
Eelco Dolstra
498f34b336
Merge pull request #48 from DeterminateSystems/sync-2.28.3
Sync with upstream 2.28.3
2025-04-30 17:16:47 +00:00
Eelco Dolstra
c92cb4c130 Tagging release 2.28.3
-----BEGIN PGP SIGNATURE-----
 
 iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmgRLc8THGVkb2xzdHJh
 QGdtYWlsLmNvbQAKCRCBcLRybXGY3itzB/0ehHDYPXycvwpdL4MuAcroY5GgQJLz
 dGkrmv9tMQXERqjnqd86LW6BgKwG3UY12xFMeFgYQyV/TzC6iwZUgI+Kr+baFMhH
 JoEXgLTXRwnyC54mXUGPrX6P9MwPBoUpAClaG5iH9SCV70Z/PLuXsd4/HoDmLxsi
 tVCTxoq9kn7o/YAMOQGY3KTfM26LqEPOv2vTco2ETEnNqSXCjUJ/MniMdTGCsTxy
 rdWqel95EuIb0qsMSRPrVV6xmx/KjamTSzdCcXWQbpAu4xjUyacnjL3XpGWkMUKV
 HKtbNdXboHwJgtwe66HMCgtfWPB6JCamMRm+h/b6BrTTz46eJWiaG/KW
 =Exmm
 -----END PGP SIGNATURE-----

Merge tag '2.28.3' into sync-2.28.3

Tagging release 2.28.3
2025-04-30 17:45:27 +02:00
Graham Christensen
eaae67bb4e
Merge pull request #41 from DeterminateSystems/push-xnskkytzsuom
Generate release notes when proposing a release, clean up templates
2025-04-29 15:39:35 +00:00
Graham Christensen
282910bff2
Merge pull request #46 from DeterminateSystems/release-v3.4.1/a9837432-a15d-4f23-9bb3-ef09aa99ce3c
Release v3.4.1
2025-04-28 22:50:11 +00:00
Graham Christensen
03e2f2f931
Merge pull request #44 from DeterminateSystems/remove-trailing-slash
Remove trailing slash in Zero to Nix URL
2025-04-28 22:19:40 +00:00
github-actions[bot]
7cf6869f98
Set .version-determinate to 3.4.1 2025-04-28 21:54:55 +00:00
github-actions[bot]
de24714a90
Prepare release v3.4.1 2025-04-28 21:54:52 +00:00
Luc Perkins
71e735385a
Change language around guide 2025-04-28 15:39:38 -03:00
Luc Perkins
506f489dae
Remove other trailing slash 2025-04-28 15:04:29 -03:00
Luc Perkins
2e2d795b46
Remove trailing slash in Zero to Nix URL 2025-04-28 14:52:01 -03:00
Graham Christensen
e44d4b7ec0
Update .github/release-notes.sh 2025-04-28 12:59:02 -04:00
Graham Christensen
e2cce0e026
Update .github/release-notes.sh
Co-authored-by: gustavderdrache <gustavderdrache@gmail.com>
2025-04-28 12:42:48 -04:00
Graham Christensen
5a87809b25
Update .github/release-notes.sh
Co-authored-by: gustavderdrache <gustavderdrache@gmail.com>
2025-04-28 10:29:49 -04:00
Jörg Thalheim
4d4a91ab8d
Merge pull request #13101 from NixOS/mergify/bp/2.28-maintenance/pr-13100
allocate SimpleLogger before forking (backport #13100)
2025-04-28 09:48:32 +02:00
Philipp Otterbein
9ba32a2981 allocate SimpleLogger before forking
(cherry picked from commit 4e95f662db)
2025-04-28 07:02:02 +00:00
Graham Christensen
ce1cca8ebd Allow useless cat. 2025-04-27 17:26:59 -04:00
Graham Christensen
81350e1ffc Update our issue and PR templates to be "us" 2025-04-27 17:19:23 -04:00
Graham Christensen
e057d0d67c Drop upstream CODEOWNERS 2025-04-27 17:19:09 -04:00
Graham Christensen
25ef7a1956 Automatically generate release notes draft during proposal 2025-04-27 17:08:41 -04:00
Graham Christensen
3c5d7822c5 Add a couple markers for injecting new updated content 2025-04-27 16:25:50 -04:00