Eelco Dolstra
953ec00794
getFlake(): Don't use registries for refetching
...
`newLockedRef` is already resolved so there is no need to re-resolve
it.
2025-04-25 13:46:42 +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
Sergei Zimmerman
9fff868e39
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.
2025-04-25 13:35:16 +03: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
Jörg Thalheim
27047570b5
Merge pull request #13086 from xokdvium/bad-format-string
...
libutil: Fix invalid boost format string in infinite symlink recursion error
2025-04-25 11:20:04 +02: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
Jörg Thalheim
96a1740942
Merge pull request #13088 from NixOS/fix-ignore-local-registries
...
Fix ignore local registries
2025-04-25 11:19:25 +02:00
Graham Christensen
d97d311ddf
Emit a warning about channel deprecation.
2025-04-24 20:27:20 -04:00
Sergei Zimmerman
1b5c8aac12
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.
2025-04-24 22:27:03 +00:00
Sergei Zimmerman
bfb357c40b
libutil: Fix invalid boost format string in infinite symlink recursion error
...
Found while working on an automated migration to `std::format`.
2025-04-24 21:00:24 +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
Eelco Dolstra
68de26d38a
lockFlake(): Allow registry lookups for the top-level flake
...
Fixes #13050 .
2025-04-24 18:59:10 +02:00
Cole Helbling
e1b68244ad
nix-cli: restore binary-dist artifact to Hydra static builds
2025-04-24 08:46:47 -07:00
Eelco Dolstra
dda265f09a
Reapply "Actually ignore system/user registries during locking"
...
This reverts commit 3b5f0d9fb3
2025-04-24 17:33:27 +02:00
Eelco Dolstra
2aa3655166
computeBaseName(): Respect the original store path name
2025-04-24 17:08:33 +02: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
Eelco Dolstra
9d87ab1dc8
Add a setting to enable lazy trees
2025-04-24 16:16:28 +02:00
Graham Christensen
cecbb2b22c
Improve the "dirty" message, by clarifying what the jargon means
...
FH-735
2025-04-24 09:43:11 -04:00
Jörg Thalheim
04fcc879e6
Revert "Actually ignore system/user registries during locking"
...
This reverts commit 77d43163533b5f0d9fb3
2025-04-24 11:34:57 +00:00
Jörg Thalheim
3b5f0d9fb3
Revert "Actually ignore system/user registries during locking"
...
This reverts commit 77d4316353
2025-04-24 11:28:11 +02:00
Graham Christensen
d74acf1954
Hide the "dirty" notice when running nix develop
...
In the common case, nix develop is running against a dirty checkout of a project.
This patch removes the warning about a dirty tree on nix develop only.
Close FH-736
2025-04-23 21:29:05 -04:00
Robert Hensing
8a1c40b927
Merge pull request #13065 from roberth/escapeShellArg
...
Rename `shellEscape` -> `escapeShellArgAlways`
2025-04-23 23:35:15 +02:00
Robert Hensing
1e5b1d9973
Rename shellEscape -> escapeShellArgAlways
...
This name is close to the Nixpkgs lib function `escapeShellArg`,
making it easier to find.
A friendlier function with the same behavior as lib could be added
later.
2025-04-23 22:56:07 +02:00
Eelco Dolstra
5a2ee1b952
Move libflake/flake/* to libflake
...
(cherry picked from commit bc67e47298
2025-04-23 19:06:03 +00:00
Eelco Dolstra
d3c79e2b13
Don't build MonitorFdHup on Windows
...
https://hydra.nixos.org/build/295398462
(cherry picked from commit a9b6213221
2025-04-23 18:23:51 +00:00
John Ericson
9eb608cbef
Merge pull request #13070 from DeterminateSystems/fix-windows
...
Don't build MonitorFdHup test on Windows
2025-04-23 14:23:15 -04:00
John Ericson
714662e675
Merge pull request #13068 from DeterminateSystems/fix-warning
...
DerivationBuilder: Fix compiler warning
2025-04-23 14:10:55 -04:00
John Ericson
052d5cb3fe
Merge pull request #13067 from DeterminateSystems/move-libflake
...
Move libflake/flake/* to libflake
2025-04-23 14:03:35 -04:00
Eelco Dolstra
a9b6213221
Don't build MonitorFdHup on Windows
...
https://hydra.nixos.org/build/295398462
2025-04-23 19:51:13 +02:00
Eelco Dolstra
fd0835e7d7
Fix signedness error on FreeBSD
...
https://hydra.nixos.org/build/295398446
2025-04-23 17:41:35 +02:00
Eelco Dolstra
d07541be29
DerivationBuilder: Fix compiler warning
...
Fixes
../src/libstore/unix/build/derivation-builder.cc:1130:86: warning: the compiler can assume that the address of ‘nix::DerivationBuilderParams::drv’ will never be NULL [-Waddress]
1130 | if (useChroot && settings.preBuildHook != "" && dynamic_cast<const Derivation *>(&drv)) {
| ^~~~
Assuming this check was left over from the time `drv` could be a
`BasicDerivation`.
2025-04-23 17:28:09 +02:00
Eelco Dolstra
bc67e47298
Move libflake/flake/* to libflake
2025-04-23 17:20:42 +02:00
Eelco Dolstra
182edb4dee
Move mountInput into EvalState
2025-04-23 13:53:29 +02:00
Eelco Dolstra
a6faa69fc8
Merge remote-tracking branch 'detsys/detsys-main' into lazy-trees-tmp
2025-04-23 12:25:28 +02:00
John Ericson
155411397d
Merge pull request #13055 from obsidiansystems/inlined-resolvedFinished
...
Inline `DerivationGoal::resolvedFinished`
2025-04-20 19:11:38 -04:00
John Ericson
54b7ccc466
Merge pull request #13053 from obsidiansystems/no-more-local-derivation-goal
...
Get rid of `LocalDerivationGoal`
2025-04-20 18:50:05 -04:00
John Ericson
16f640a9b2
Inline DerivationGoal::resolvedFinished
...
`resolvedDrvGoal` can just become a local variable!
2025-04-20 18:32:19 -04:00
Robert Hensing
15fa95f925
Merge pull request #13052 from rhendric/rhendric/increase-429-delay
...
libstore: increase retry delay for 429
2025-04-21 00:31:15 +02:00
John Ericson
4e586149df
Get rid of LocalDerivationGoal
...
I split it out before to try to separate the building logic, but now we
have the much better `DerivationBuilder` abstraction for that. With that
change, I think `LocalDerivationGoal` has outlived its usefulness.
We just inline it back into `DerivationGoal`, and do so with minimal
`#ifdef` for Windows.
Note that the order of statements in `~DerivationGoal` is different than
it was after the `~LocalDerivationGoal` split, but it is *restored* to
the way it original was before --- evidently I did the split slightly
wrong, but nobody noticed, probably because the order doesn't actually
matter.
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
2025-04-20 18:09:41 -04:00
Robert Hensing
047f2bc1af
refactor: Extract RETRY_TIME constants in filetransfer
2025-04-20 23:29:22 +02:00
Robert Hensing
363ee6dfcb
Fix non-virtual destructor warning
2025-04-20 23:05:21 +02:00
Ryan Hendrickson
85420b8537
libstore: increase retry delay for 429
...
A 429 (Too Many Requests) error should not be retried after a quarter of
a second; that's just silly. GitHub recommends a minute.
2025-04-20 14:49:03 -04:00
John Ericson
5eeeb44f79
Remove double indirection from DerivationBuilder params
...
Now that `DerivationBuilder` is created after the underlying data has
already been initialized, we can just refer this data normally, with a
direct reference.
Only `parsedDrv` takes a (borrowing) pointer, because independent of
initialization the derivation may or may not have structured attrs.
2025-04-18 12:26:05 -04:00
John Ericson
2b2ea218d9
Delay constructing a DerivationBuilder until we're about to build
...
This makes the simplification in the following commit possible.
2025-04-18 12:26:05 -04:00
John Ericson
27907e6cac
Add documentation for DerivationBuilder::{parsedDrv, drvOptions}
2025-04-18 12:26:05 -04:00
Eelco Dolstra
43a26916c2
unsafeGetAttrPos: Set string context on store paths
...
This is needed to devirtualize them when they get passed to a
derivation or builtins.toFile. Arguably, since this builtin is unsafe,
we could just ignore this, but we may as well do the correct thing.
2025-04-18 16:01:19 +02:00
Eelco Dolstra
9574d3938f
Tagging release 2.28.2
...
-----BEGIN PGP SIGNATURE-----
iQFHBAABCAAxFiEEtUHVUwEnDgvPFcpdgXC0cm1xmN4FAmgA7TQTHGVkb2xzdHJh
QGdtYWlsLmNvbQAKCRCBcLRybXGY3l0rB/0c5l5EhZUAMvjnUhug8+6/g6fLLisS
ehrP9FxrjV5D2lO3EQcsBgW3bYzOwbcubuPBq8yPMlSLpf+uiAV1qxSKFGD3pnpZ
6o7K3P3kaohFl6JL5oEn9yTGgm1EubYpW3c9zO8yaL32Jknjm44bD4mKr5Rz18jI
YUfe1xDeYCwRY7YMrBKGwU2v/tlsjMX9XQlHuKPSx8uVA/UgxJk/41dIdzb0rhw5
ueuKO2GEEMd/iV5lCEVFnk1WJoHru1fqTDAqRhDZJjFVbguYAIl7OQFQuBbtG3hv
6SFC0iy/IoSrj9tRwSV+4wQU5fk6Gw2IYQlIw6VSx6xIydf46AjomPjX
=xUfr
-----END PGP SIGNATURE-----
Merge tag '2.28.2' into detsys-main
Tagging release 2.28.2
2025-04-17 16:58:05 +02:00
Jörg Thalheim
b3bbbd2e71
fix armv7/i686 build
2025-04-17 13:56:11 +02:00
