Eelco Dolstra
3f811c2373
Merge pull request #13094 from xokdvium/file-content-address-fmt-string
...
libutil: Add missing format arguments to UsageError ctor
2025-04-25 15:21:57 +02: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
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
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
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
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
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
Jörg Thalheim
94edfb1a3b
Merge pull request #13087 from xokdvium/libutil-git-permission-format
...
libutil: Use correct argument to Error format ctor
2025-04-25 11:18:58 +02:00
Jörg Thalheim
6405d6822d
tests/flakes: add regression test for resolving user flakes
2025-04-25 10:34:41 +02: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
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
mergify[bot]
b287f33090
Merge pull request #13085 from NixOS/bump-nixpkgs
...
flake.lock: Update
2025-04-24 20:23:53 +00: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
John Ericson
3e7d85dfdb
flake.lock: Update
...
Flake lock file updates:
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/f675531bc7e6657c10a18b565cfebd8aa9e24c14?narHash=sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U%3D' (2025-04-09)
→ 'github:NixOS/nixpkgs/8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7?narHash=sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo%3D' (2025-04-23)
2025-04-24 13:43:53 -04: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
Jörg Thalheim
a8fb23b716
Merge pull request #13079 from cole-h/cole-h/push-romznoxnzppy
...
nix-cli: restore binary-dist artifact to Hydra static builds
2025-04-24 19:29:59 +02: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
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
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
8686ba906f
Merge pull request #13077 from NixOS/mergify/bp/2.28-maintenance/pr-13076
...
Revert "Actually ignore system/user registries during locking" (backport #13076 )
2025-04-24 14:07:10 +02: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
7880afcacd
Merge pull request #13076 from Mic92/fix-ignore-local-registrie
...
Revert "Actually ignore system/user registries during locking"
2025-04-24 13:33:31 +02: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
mergify[bot]
4da3fada6e
Merge pull request #13072 from NixOS/mergify/bp/2.28-maintenance/pr-13067
...
Move libflake/flake/* to libflake (backport #13067 )
2025-04-23 19:39:27 +00:00
Eelco Dolstra
5a2ee1b952
Move libflake/flake/* to libflake
...
(cherry picked from commit bc67e47298
2025-04-23 19:06:03 +00:00
mergify[bot]
06cc94432e
Merge pull request #13071 from NixOS/mergify/bp/2.28-maintenance/pr-13070
...
Don't build MonitorFdHup test on Windows (backport #13070 )
2025-04-23 18:50:06 +00:00
John Ericson
cccc26dcb1
Merge pull request #13059 from VitGottwald/patch-1
...
Use python3 packages in deps
2025-04-23 14:43:06 -04: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
John Ericson
36fa9b90d8
Merge pull request #13069 from DeterminateSystems/fix-freebsd
...
Fix signedness error on FreeBSD
2025-04-23 14:02:13 -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
