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
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
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
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
mergify[bot]
011f6e06a2
Merge pull request #13006 from NixOS/mergify/bp/2.28-maintenance/pr-12538
...
libstore S3: fix progress bar and make file transfers interruptible (backport #12538 )
2025-04-11 22:54:15 +00:00
Philipp Otterbein
61bb405839
add isInterrupted() call and replace some checkInterrupt() occurrences
...
(cherry picked from commit 49f757c24a
2025-04-11 22:15:12 +00:00
Philipp Otterbein
c53bd8905b
libstore: same progress bar behavior for PUT and POST requests
...
- no differentiation between uploads and downloads in CLI
(cherry picked from commit db297d3dda
2025-04-11 22:15:12 +00:00
Philipp Otterbein
beab9eb978
libstore S3: fix progress bar and make file transfers interruptible
...
(cherry picked from commit 9da01e69f9
2025-04-11 22:15:11 +00:00
mergify[bot]
4d990f1459
Merge pull request #12989 from NixOS/mergify/bp/2.28-maintenance/pr-12986
...
Fix another machine config parsing bug (backport #12986 )
2025-04-09 20:51:33 +00:00
John Ericson
f9c262c3d5
Fix another machine config parsing bug
...
We were ignorning the result of `trim`, and after my last change we were
also trimmming too early.
(cherry picked from commit b74b0f4e1c
2025-04-09 20:13:30 +00:00
mergify[bot]
bb8af4ceb7
Merge pull request #12985 from NixOS/mergify/bp/2.28-maintenance/pr-12984
...
Fix `;` and `#` bug in machine file parsing (backport #12984 )
2025-04-09 19:04:07 +00:00
John Ericson
2892b758b3
Fix ; and # bug in machine file parsing
...
Comments go to the end of the line, not merely the next ; *or* \n. Fix
by splitting on `;` *within* lines, and test.
(cherry picked from commit f8b13cce19
2025-04-09 18:27:16 +00:00
mergify[bot]
e191b93a0e
Merge pull request #12983 from NixOS/mergify/bp/2.28-maintenance/pr-12699
...
tests/functional/flakes: Add test case for subflake locking (backport #12699 )
2025-04-09 17:54:32 +00:00
Rodney Lorrimar
080950b0fe
tests/functional/flakes: Add test case for subflake locking
...
This adds a test case where the lockfile of a relative path flake
dependency is updated.
It was reported by a user here: https://discourse.nixos.org/t/updating-local-subflakes-inputs-when-building-root-flake/61682
I think this test case relates to issue #7730 .
Because the issue is not resolved, this test case would fail without
the `|| true` clause.
(cherry picked from commit 1bc82d1c86
2025-04-09 17:20:31 +00:00
mergify[bot]
6d98cef93f
Merge pull request #12982 from NixOS/mergify/bp/2.28-maintenance/pr-12979
...
Actually ignore system/user registries during locking (backport #12979 )
2025-04-09 17:07:38 +00:00
Eelco Dolstra
a08477975d
Actually ignore system/user registries during locking
...
Something went wrong in #12068 so this didn't work. Also added a test.
(cherry picked from commit 77d4316353
2025-04-09 16:33:47 +00:00
Eelco Dolstra
c548e92860
Merge pull request #12966 from NixOS/mergify/bp/2.28-maintenance/pr-12958
...
Fix some unlinked tests (backport #12958 )
2025-04-08 13:55:54 +02:00
mergify[bot]
a7f078aa84
Merge pull request #12972 from NixOS/mergify/bp/2.28-maintenance/pr-12967
...
Add trailing commas on addFlag incantations (backport #12967 )
2025-04-07 23:56:11 +00:00
Graham Christensen
cd7e01526e
format as required
...
(cherry picked from commit 9b47b2b217
2025-04-07 23:16:28 +00:00
Graham Christensen
16a2cddfb9
Add trailing commas on addFlag incantations
...
(cherry picked from commit 06acbd37bd
2025-04-07 23:16:27 +00:00
mergify[bot]
1a4332fd3a
Merge pull request #12965 from NixOS/mergify/bp/2.28-maintenance/pr-12962
...
Fix some clang-tidy warnings (backport #12962 )
2025-04-07 21:17:06 +00:00
Eelco Dolstra
3a4dc47c22
Remove unused tracing-file-system-object-sink.{hh,cc}
...
(cherry picked from commit 611fd806cb
2025-04-07 20:42:08 +00:00
Eelco Dolstra
f0ed61bb4e
Fix/run monitorfdhup test
...
(cherry picked from commit 340fa00d52
2025-04-07 20:42:08 +00:00
Eelco Dolstra
85902fad58
Fix some clang-tidy warnings
...
(cherry picked from commit c0ad5d36c4
2025-04-07 20:38:07 +00:00
mergify[bot]
467a1df842
Merge pull request #12964 from NixOS/mergify/bp/2.28-maintenance/pr-12959
...
Keep fchmodat2-compat.hh private (backport #12959 )
2025-04-07 20:32:05 +00:00
Eelco Dolstra
aa1c690ebf
Keep fchmodat2-compat.hh private
...
Since it references store-config-private.hh.
(cherry picked from commit 04e9dc27ac
2025-04-07 19:18:46 +00:00
mergify[bot]
3a758fc348
Merge pull request #12963 from NixOS/mergify/bp/2.28-maintenance/pr-12961
...
Make lexer-helpers.hh internal to fix a clang-tidy error (backport #12961 )
2025-04-07 19:04:29 +00:00
Eelco Dolstra
17de9dd275
Make lexer-helpers.hh internal to fix a clang-tidy error
...
(cherry picked from commit 8be24f58f2
2025-04-07 18:29:08 +00:00
mergify[bot]
6dde30bacf
Merge pull request #12960 from NixOS/mergify/bp/2.28-maintenance/pr-12956
...
Fix meson warnings on minimum version (backport #12956 )
2025-04-07 18:26:02 +00:00
Sandro
5b21c94fab
Fix meson warnings on minimum version
...
nix> meson.build:216: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:222: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:235: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:236: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
nix> meson.build:242: WARNING: Project targets '>= 1.1' but uses feature introduced in '1.4.0': fs.name with build_tgt, custom_tgt, and custom_idx.
(cherry picked from commit 14a829acbb
2025-04-07 17:51:44 +00:00
mergify[bot]
a4962f73b5
Merge pull request #12955 from NixOS/mergify/bp/2.28-maintenance/pr-12951
...
tests/functional/repl: fix race condition (backport #12951 )
2025-04-07 12:52:09 +00:00
