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

20204 commits

Author SHA1 Message Date
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
Graham Christensen
234f790d62
Merge pull request #39 from DeterminateSystems/release-v3.4.0/3dffc8a4-b1ae-48d8-aac3-ae109dc93cda
Release v3.4.0
2025-04-25 21:08:37 +00:00
Graham Christensen
173c742afc
Prep 3.4.0 release notes (#40) 2025-04-25 16:56:57 -04:00
github-actions[bot]
48e976af63
Set .version-determinate to 3.4.0 2025-04-25 20:35:35 +00:00
github-actions[bot]
050e2e07bc
Prepare release v3.4.0 2025-04-25 20:35:32 +00:00
Eelco Dolstra
bbde3da254
Merge pull request #38 from DeterminateSystems/warn-registry-inputs
Warn against the use of indirect flakerefs in flake inputs
2025-04-25 19:58:07 +00:00
Eelco Dolstra
a9c1751e2f
Update src/libflake/flake/flake.cc
Co-authored-by: Graham Christensen <graham@grahamc.com>
2025-04-25 21:51:32 +02:00
Eelco Dolstra
ca1b2dc617 Warn against the use of indirect flakerefs in flake inputs 2025-04-25 21:16:27 +02:00
Eelco Dolstra
97487c58a1
Merge pull request #36 from DeterminateSystems/deprecate-channel-urls
Warn about the use of channel URLs
2025-04-25 15:01:32 +00:00
Eelco Dolstra
797c716f74 Suggest fix 2025-04-25 16:05:17 +02:00
mergify[bot]
323e840d17
Merge pull request #13097 from NixOS/mergify/bp/2.28-maintenance/pr-13094
libutil: Add missing format arguments to UsageError ctor (backport #13094)
2025-04-25 14:04:08 +00:00
Sergei Zimmerman
1c9e94789e libutil: Add missing format arguments to UsageError ctor
Once again found by an automated migration to `std::format`.
I've tested that boost::format works fine with `std::string_view`
arguments.

(cherry picked from commit 9fff868e39)
2025-04-25 13:22:58 +00:00
Eelco Dolstra
e20b0d7b29
Merge pull request #13090 from NixOS/mergify/bp/2.28-maintenance/pr-13082
Actually ignore system/user registries during locking (2nd attempt) (backport #13082)
2025-04-25 14:13:27 +02:00
Jörg Thalheim
709f05989d tests/flakes: add regression test for resolving user flakes
(cherry picked from commit 6405d6822d)
2025-04-25 13:32:13 +02:00
Eelco Dolstra
dfbb52e6bd lockFlake(): Allow registry lookups for the top-level flake
Fixes #13050.

(cherry picked from commit 68de26d38a)
2025-04-25 13:31:24 +02:00
mergify[bot]
5a7cdc4373
Merge pull request #13092 from NixOS/mergify/bp/2.28-maintenance/pr-13086
libutil: Fix invalid boost format string in infinite symlink recursion error (backport #13086)
2025-04-25 10:48:47 +00:00
mergify[bot]
357a0f639c
Merge pull request #13089 from NixOS/mergify/bp/2.28-maintenance/pr-13087
libutil: Use correct argument to Error format ctor (backport #13087)
2025-04-25 10:01:27 +00:00
Eelco Dolstra
17a40e5195 Warn about the use of channel URLs 2025-04-25 11:22:21 +02:00
Sergei Zimmerman
10350537b1 libutil: Fix invalid boost format string in infinite symlink recursion error
Found while working on an automated migration to `std::format`.

(cherry picked from commit bfb357c40b)
2025-04-25 09:21:22 +00:00
Sergei Zimmerman
b179259d6f libutil: Use correct argument to Error format ctor
It seems that the intention was to format a number in base 8 (as
suggested by the %o format specifier), but `perms` is a `std::string`
and not a number. Looks like `rawMode` is the correct thing to use here.

(cherry picked from commit 1b5c8aac12)
2025-04-25 09:19:52 +00:00
Eelco Dolstra
6468ece640
Merge pull request #35 from DeterminateSystems/push-zkyqytsppswn
Emit a warning about channel deprecation.
2025-04-25 08:21:04 +00:00
Graham Christensen
d97d311ddf Emit a warning about channel deprecation. 2025-04-24 20:27:20 -04:00
mergify[bot]
3019007eb5
Merge pull request #13083 from NixOS/mergify/bp/2.28-maintenance/pr-13079
nix-cli: restore binary-dist artifact to Hydra static builds (backport #13079)
2025-04-24 18:03:30 +00:00
Cole Helbling
6390b8b7cf nix-cli: restore binary-dist artifact to Hydra static builds
(cherry picked from commit e1b68244ad)
2025-04-24 17:30:39 +00:00
Graham Christensen
ad7100fd6c
Merge pull request #33 from DeterminateSystems/push-qvlnukytmqwu
Hide the "dirty" notice when running nix develop
2025-04-24 14:43:43 +00:00
Graham Christensen
3c5c484e6f
Merge pull request #32 from DeterminateSystems/push-kyzutzxyuwnv
Improve the "dirty" message, by clarifying what the jargon means
2025-04-24 14:33:44 +00:00