JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mkosi: 21 -> 22

Browse Source
This commit is contained in:
Paul Meyer 2024-03-19 06:25:42 +00:00
parent 39de88f344
commit 5a07560443
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/doc/manual/release-notes/rl-2405.section.md
View File

@ -293,9 +293,11 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- Proxies are now defined with a new option `settings.proxies` which takes a list of proxies.
- Consult the [upstream documentation](https://github.com/fatedier/frp#example-usage) for more details on the changes.
- `mkosi` was updated to v20. Parts of the user interface have changed. Consult the
release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19) and
[v20](https://github.com/systemd/mkosi/releases/tag/v20) for a list of changes.
- `mkosi` was updated to v22. Parts of the user interface have changed. Consult the
release notes of [v19](https://github.com/systemd/mkosi/releases/tag/v19),
[v20](https://github.com/systemd/mkosi/releases/tag/v20),
[v21](https://github.com/systemd/mkosi/releases/tag/v21) and
[v22](https://github.com/systemd/mkosi/releases/tag/v22) for a list of changes.
- `gonic` has been updated to v0.16.4. Config now requires `playlists-path` to be set. See the rest of the [v0.16.0 release notes](https://github.com/sentriz/gonic/releases/tag/v0.16.0) for more details.

8
pkgs/tools/virtualization/mkosi/default.nix
View File

@ -25,7 +25,6 @@
# Optional dependencies
, withQemu ? false
, qemu
, OVMF
}:
let
# For systemd features used by mkosi, see
@ -45,7 +44,7 @@ let
in
buildPythonApplication rec {
pname = "mkosi";
version = "21";
version = "22";
format = "pyproject";
outputs = [ "out" "man" ];
@ -54,7 +53,7 @@ buildPythonApplication rec {
owner = "systemd";
repo = "mkosi";
rev = "v${version}";
hash = "sha256-ONahHWDPB9EOdqyiogLjrSwdtXidWG0aYXE4F7khg0I=";
hash = "sha256-Zom1GlyhqgpTKfjcBOUEJMlubSn+TQsk97js1/UfDHY=";
};
# Fix ctypes finding library
@ -66,8 +65,7 @@ buildPythonApplication rec {
--replace '/usr/lib/systemd/ukify' "${systemdForMkosi}/lib/systemd/ukify"
'' + lib.optionalString withQemu ''
substituteInPlace mkosi/qemu.py \
--replace '/usr/share/ovmf/x64/OVMF_VARS.fd' "${OVMF.variables}" \
--replace '/usr/share/ovmf/x64/OVMF_CODE.fd' "${OVMF.firmware}"
--replace "usr/share/qemu/firmware" "${qemu}/share/qemu/firmware"
'';
nativeBuildInputs = [