Skip to content

[pull] master from nix-community:master#224

Merged
pull[bot] merged 15 commits intokhaneliman:masterfrom
nix-community:master
Nov 16, 2024
Merged

[pull] master from nix-community:master#224
pull[bot] merged 15 commits intokhaneliman:masterfrom
nix-community:master

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Nov 15, 2024

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

KostaGorod and others added 15 commits November 1, 2024 09:46
Added `mkAfter` to `git.extraConfig` to ensure our oauth is last, as
required to work with additional helpers.
Adds a new Podman module for creating user containers and networks as
systemd services. These are installed to the user's
`$XDG_CONFIG/systemd/user` directory.
Call to git-maintenance in the systemd user service was using a
erroneous value for exec-path flag. Removing the flag is fine.
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/18536bf04cd71abd345f9579158841376fdd0c5a?narHash=sha256-RP%2BOQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM%3D' (2024-10-25)
  → 'github:NixOS/nixpkgs/807e9154dcb16384b1b765ebe9cd2bba2ac287fd?narHash=sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU%3D' (2024-10-29)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
This makes extraPackages the default, but they do not shadow the env
so you can still have packages (e.g. LSPs) with a different version
than the global one in you local env like nix's shells.
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/807e9154dcb16384b1b765ebe9cd2bba2ac287fd?narHash=sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU%3D' (2024-10-29)
  → 'github:NixOS/nixpkgs/76612b17c0ce71689921ca12d9ffdc9c23ce40b2?narHash=sha256-IigrKK3vYRpUu%2BHEjPL/phrfh7Ox881er1UEsZvw9Q4%3D' (2024-11-09)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Recent nixpkgs update made a small change to how TOML is generated,
causing the test toml to be out of date.
Recent nixpkgs update made a small change to how TOML is generated,
causing the test toml to be out of date.
Recent nixpkgs update made a small change how YAML is generated,
causing the test YAML to be out of date.

The replacement match is also an exact example from the espanso wiki
https://espanso.org/docs/matches/basics/#multi-line-expansions.
systemd rejects the service unit due to whitespace in the environment
variable assignment, pointing to the repo path, being invalid for
systemd's unit format.

See #6023 for
details.

The git-sync variable should also be escaped due to similar issues
with e.g. local git urls.
- added themes option
- added themes test
- updated broken man page links
@pull pull bot added the ⤵️ pull label Nov 16, 2024
@pull pull bot merged commit 1d0862e into khaneliman:master Nov 16, 2024
khaneliman added a commit that referenced this pull request Nov 26, 2025
Testing if DeterminateSystems/update-flake-lock#224 fixes the
actions/checkout@v6 incompatibility by using the PR commit directly.

If successful, this PR can be merged upstream to fix the issue.

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants