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
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
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
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
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
mergify[bot]
70921714cb
Merge pull request #13064 from NixOS/mergify/bp/2.28-maintenance/pr-13010
...
~flake.lock:~ Update Nixpkgs (partial backport #13010 )
2025-04-23 15:09:17 +00:00
John Ericson
f666ec3837
Explain the use of "2" in the overlay
...
Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
(cherry picked from commit ef36806898
2025-04-23 16:42:02 +02:00
Robert Hensing
ba22a85a35
Fix pkgs.nixVersions and installTests
...
... by moving our stuff out of the way from upstream's
`nixComponents` and `nixDependencies` attrsets.
(I prefer not to use overlays, but let's make it work this way
first)
(cherry picked from commit b257ea94e3
2025-04-23 16:42:02 +02:00
Eelco Dolstra
182edb4dee
Move mountInput into EvalState
2025-04-23 13:53:29 +02:00
Eelco Dolstra
ff85b347b8
Temporarily run all flake regression tests
2025-04-23 12:27:25 +02:00
Eelco Dolstra
a6faa69fc8
Merge remote-tracking branch 'detsys/detsys-main' into lazy-trees-tmp
2025-04-23 12:25:28 +02: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
a8979e05b1
Merge pull request #31 from DeterminateSystems/sync-2.28.2
...
Sync with upstream 2.28.2
2025-04-17 15:35:51 +00: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
Eelco Dolstra
e555207048
Bump version
2025-04-17 14:00:34 +02:00
mergify[bot]
8a7b8dce5f
Merge pull request #13033 from NixOS/mergify/bp/2.28-maintenance/pr-13032
...
Improve derivation "advanced attrs" test, fix almost-bug (backport #13032 )
2025-04-15 19:06:26 +00:00
John Ericson
29ae14114e
Remove stray assignment side affect in lambda
...
This was almost a bug! It wasn't simply because another assignment would
clobber it later.
(cherry picked from commit 32409dd7d7
2025-04-15 14:25:16 -04:00
John Ericson
30d900b313
Derivation "advanced attrs" test: Ensure fields are set to distinct values
...
We had fields set to the same values before in our test data. This is
not a problem per-se, but does mean we wouldn't catch certain mixups.
Now, the fields are set to distinct values (where possible), which makes
the test more robust.
(cherry picked from commit a0b2b75f59
2025-04-15 14:25:13 -04:00
John Ericson
5f0ddd7467
Merge pull request #13028 from NixOS/mergify/bp/2.28-maintenance/pr-13022
...
Test derivation options with content-addressing too (backport #13022 )
2025-04-15 12:11:55 -04:00
Eelco Dolstra
0c0dda3b29
Devirtualize double-copied paths
...
Borrowed from the original lazy-trees branch.
2025-04-15 17:44:56 +02:00
John Ericson
f19184191e
Test derivation options with content-addressing too
...
Now, both the unit and functional tests relating to derivation options
are tested both ways -- with input addressing and content-addressing
derivations.
(cherry picked from commit 307dbe9914
2025-04-15 11:25:07 -04:00
John Ericson
37bcd29e5f
Use the same variable for content addressing in functional tests
...
`CONTENT_ADDRESSED` -> `NIX_TESTS_CA_BY_DEFAULT`
(cherry picked from commit 7acc229c8f
2025-04-15 11:19:45 -04:00
Eelco Dolstra
5ecbf6b9dc
Merge pull request #13029 from NixOS/mergify/bp/2.28-maintenance/pr-13026
...
Fix issue #13018 , `sourceInfo` strict in `outputs` (backport #13026 )
2025-04-15 14:24:59 +02:00
Jörg Thalheim
f233a99cc8
Merge pull request #13027 from NixOS/mergify/bp/2.28-maintenance/pr-12603
...
libstore: curl retry: reset content-encoding and don't use string after move (backport #12603 )
2025-04-15 14:00:13 +02:00
Robert Hensing
818fc68db6
fix: Evaluate flake parent source without evaluating its outputs
...
This requires that we refer to the `sourceInfo` instead of the
`result`. However, `sourceInfo` does not create a chain of basedir
resolution, so we add that back with `flakeDir`.
(cherry picked from commit 2109a5a206
2025-04-15 11:52:46 +00:00
Robert Hensing
671364748c
call-flake.nix: allNodes.${key} -> allNodes.${key}.result
...
(cherry picked from commit 9de9410f29
2025-04-15 11:52:45 +00:00
Robert Hensing
9a969e29cf
call-flake.nix: refactor: Bring mapAttrs into scope
...
(cherry picked from commit 674375b021
2025-04-15 11:52:45 +00:00
Philipp Otterbein
a603401cdd
libstore: curl retry: reset content-encoding and don't use string after move
...
(cherry picked from commit b129fc8237
2025-04-15 11:22:25 +00:00
Eelco Dolstra
3e895be4e4
Merge pull request #13021 from NixOS/mergify/bp/2.28-maintenance/pr-13019
...
Mention BLAKE3 in the Nix 2.27 release notes (backport #13019 )
2025-04-14 16:13:07 +02:00
Eelco Dolstra
b1a1f4bd2f
Mention BLAKE3 in the Nix 2.27 release notes
...
(cherry picked from commit c0ed07755a
2025-04-14 13:47:57 +00:00
Eelco Dolstra
e099a5bc67
Move the InputCache to EvalState
2025-04-14 15:02:24 +02:00
Jörg Thalheim
f18180a045
Merge pull request #13011 from NixOS/mergify/bp/2.28-maintenance/pr-13009
...
Fix typo in string context docs (backport #13009 )
2025-04-14 12:41:39 +02:00
Anthony Wang
9156550493
Fix typo in string context docs
...
(cherry picked from commit f64b8957c7
2025-04-12 23:58:45 +00:00
Graham Christensen
a706827799
Merge pull request #30 from DeterminateSystems/release-v3.3.1/20866552-faca-451d-8b79-7a950f146b77
...
Release v3.3.1
2025-04-12 03:07:44 +00:00
github-actions[bot]
398104dcbf
Set .version-determinate to 3.3.1
2025-04-12 02:34:37 +00:00
github-actions[bot]
c1c0e20f2e
Prepare release v3.3.1
2025-04-12 02:34:34 +00:00
