Skip to content

merge queue: embarking 2.29-maintenance (75bece8), #13594, #13586, #13602, #13592, #13596, #13637, #13641, #13639, #13618, #13635, #13626, #13628 and [#13620 + #13646 + #13610 + #13633 + #13612] together#13665

Closed
mergify[bot] wants to merge 36 commits into2.29-maintenancefrom
mergify/merge-queue/80da1a4700
Closed

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 30, 2025 •
edited
Loading

🎉 This combination of pull requests has been checked successfully and will be merged soon. 🎉

Branch 2.29-maintenance (75bece8), #13594, #13586, #13602, #13592, #13596, #13637, #13641, #13639, #13618, #13635, #13626, #13628 and [#13620 + #13646 + #13610 + #13633 + #13612] are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of [#13620 + #13646 + #13610 + #13633 + #13612].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue default for merge:

  • check-success=installer test on macos
  • check-success=installer test on ubuntu
  • check-success=tests on macos
  • check-success=tests on ubuntu
  • check-success=vm_tests
  • any of [🛡 GitHub branch protection]:
    • check-success = installer test on macos
    • check-neutral = installer test on macos
    • check-skipped = installer test on macos
  • any of [🛡 GitHub branch protection]:
    • check-success = installer test on ubuntu
    • check-neutral = installer test on ubuntu
    • check-skipped = installer test on ubuntu
  • any of [🛡 GitHub branch protection]:
    • check-success = tests on macos
    • check-neutral = tests on macos
    • check-skipped = tests on macos
  • any of [🛡 GitHub branch protection]:
    • check-success = tests on ubuntu
    • check-neutral = tests on ubuntu
    • check-skipped = tests on ubuntu

Required conditions to stay in the queue:

---
checking_base_sha: 86af940ff418a7ddddf5b9c33c83bf637d23a94a
previous_failed_batches: []
pull_requests:
  - number: 13620
  - number: 13646
  - number: 13610
  - number: 13633
  - number: 13612
...

gwennlbh and others added 30 commits July 30, 2025 12:00
@gwennlbh @mergify
docs: add another equivalence for the implication operator
a5deed3 
the second equivalence, using a if-else expression, aligns much closer to how most humans think about implication, adding it might help some people :)

(cherry picked from commit 51151c2)
@stefanboca @mergify
nix-profile{,-daemon}.fish: check for profile in XDG_DATA_HOME
9106a0b 
...and also NIX_STATE_HOME in nix-profile.fish. This is directly
translated from the bash scripts and makes the fish scripts equivalent
in functionality to the bash scripts.

Note that nix-profile.fish checks for NIX_STATE_HOME and
nix-profile-daemon.fish does not, so the two scripts are no longer
identical.

(cherry picked from commit 751f50f)
@xokdvium @mergify
export/meson: Don't require -std=c++2a for -c libraries in .pc files
709349b 
(cherry picked from commit d8da8f0)
@edolstra @mergify
Make the S3 test more robust
78ac959 
Waiting for the minio unit is apparently not reliable enough, so let's
also wait for the port.

(cherry picked from commit ca96967)
@zimbatm @mergify
nix flake archive: add --no-check-sigs option
ee39380 
Allows to copy the archive to a remote host and not get

    error: cannot add path '/nix/store/01x2k4nlxcpyd85nnr0b9gm89rm8ff4x-source' because it lacks a signature by a trusted key

(cherry picked from commit 80a4293)
@fzakaria @mergify
Overriding gtest with gmock
82fa307 
How did this work before...

* Added .direnv/ to gitignore

(cherry picked from commit 58e34a2)
@donottellmetonottellyou @mergify
add documentation of tarball-ttl to nix-channel
ed7ebdf 
(cherry picked from commit 6badd21)
@donottellmetonottellyou @fricklerhandwerk @mergify
remove overly verbose mention of fetchTarball
44a1e7e 
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
(cherry picked from commit 633d391)
@donottellmetonottellyou @fricklerhandwerk @mergify
add reference to the tarball-ttl documentation
7d17042 
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
(cherry picked from commit c0ceaa2)
@poperigby @mergify
Modify docker.nix to use mapAttrsToList instead of mapAttrsFlatten
d7ed708 
The latter alias is deprecated in favor of the former, and produces a
warning.

(cherry picked from commit cfc15d6)
@edolstra @mergify
Prevent double copy of nixpkgs source tree
bb0e9b2 
(cherry picked from commit 0a87ba0)
@lucperkins @mergify
Fix broken link in configuration description
e0ceebe 
(cherry picked from commit 525078c)
@drupol @mergify
docker: make sure nix config check works
a98f742 
(cherry picked from commit 57c72de)
@xokdvium @mergify
libexpr: Remove non-const overload of listElems
223d322 
This overload isn't actually necessary anywhere and
doesn't make much sense. The pointers to `Value`s are
themselves const, but the `Value`s are mutable.
A non-const member function implies that the object itself
can be modified but this doesn't make much sense considering
the return type: `Value * const * `, which is a pointer
to a constant array of pointers to mutable values.

(cherry picked from commit 7b46eb9)
@jayeshv @mergify
Fix a minor typo
e3f4cef 
(cherry picked from commit 699db04)
@wolfgangwalther @mergify
libstore: fix race condition when creating state directories
229e971 
Running parallel nix in nix can lead to multiple instances trying to
create the state directories and failing on the `createSymlink` step,
because the link already exists.

`replaceSymlink` is already idempotent, so let's use that.

Resolves #2706

(cherry picked from commit d64c922)
@synalice @mergify
Fix typo
27a8b45 
(cherry picked from commit 86dda98)
@synalice @mergify
Fix broken link
5d58ab8 
(cherry picked from commit da76bc0)
@synalice @mergify
Update docs
ceb4d56 
(cherry picked from commit 785f386)
@mergify
Merge of #13594
0c3bde7
@mergify
Merge of #13586
f77d386
@mergify
Merge of #13602
11fe714
@mergify
Merge of #13592
203be3c
@mergify
Merge of #13596
b204f4a
@mergify
Merge of #13637
1da4b61
@mergify
Merge of #13641
909f54d
@mergify
Merge of #13639
1cde337
@mergify
Merge of #13618
80ba0ed
@mergify
Merge of #13635
65652a0
@mergify
Merge of #13626
f20e459
@github-actions github-actions bot added documentation new-cli Relating to the "nix" command store Issues and pull requests concerning the Nix store labels Jul 30, 2025
@mergify mergify bot closed this Jul 31, 2025
@mergify mergify bot deleted the mergify/merge-queue/80da1a4700 branch July 31, 2025 02:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 will be requested when the pull request is marked ready for review Ericson2314 is a code owner

@edolstra edolstra Awaiting requested review from edolstra edolstra will be requested when the pull request is marked ready for review edolstra is a code owner

Assignees

No one assigned

Labels

documentation new-cli Relating to the "nix" command store Issues and pull requests concerning the Nix store

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.