diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-05 01:16:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-05 01:16:36 +0100 |
| commit | c2b5928c7d596a6c4ad556e76f1bd365e6667ac4 (patch) | |
| tree | ee2463d9f2f0920fc306dd44d3ff942f54fdbb00 | |
| parent | b8796f4f5451b16f7cbdb489d805b766c8b77c8d (diff) | |
| parent | 1b3451ca991649258f515afce5d1262d7c6a4291 (diff) | |
| download | nixlib-c2b5928c7d596a6c4ad556e76f1bd365e6667ac4.tar nixlib-c2b5928c7d596a6c4ad556e76f1bd365e6667ac4.tar.gz nixlib-c2b5928c7d596a6c4ad556e76f1bd365e6667ac4.tar.bz2 nixlib-c2b5928c7d596a6c4ad556e76f1bd365e6667ac4.tar.lz nixlib-c2b5928c7d596a6c4ad556e76f1bd365e6667ac4.tar.xz nixlib-c2b5928c7d596a6c4ad556e76f1bd365e6667ac4.tar.zst nixlib-c2b5928c7d596a6c4ad556e76f1bd365e6667ac4.zip | |
Merge pull request #283108 from katexochen/mkosi/0-20-2
mkosi: 20.1 -> 20.2
| -rw-r--r-- | pkgs/tools/virtualization/mkosi/default.nix | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix index 12f752432e4d..8737002c0a82 100644 --- a/pkgs/tools/virtualization/mkosi/default.nix +++ b/pkgs/tools/virtualization/mkosi/default.nix @@ -45,7 +45,7 @@ let in buildPythonApplication rec { pname = "mkosi"; - version = "20.1"; + version = "20.2"; format = "pyproject"; outputs = [ "out" "man" ]; @@ -54,9 +54,18 @@ buildPythonApplication rec { owner = "systemd"; repo = "mkosi"; rev = "v${version}"; - hash = "sha256-gkn5d9ybfrV/QYKSUyzyHAouU++NCEBDT22zFMrEZt8="; + hash = "sha256-+mvepzoswDVIHzj+rEnlr0ouphGv5unpaNX3U8x517Y="; }; + patches = [ + # sandbox: Deal correctly with unmerged-usr. + # Remove on next release after v20.2. + (fetchpatch { + url = "https://github.com/systemd/mkosi/commit/5a708efdb432dee9c6e5a9a4754752359cac8944.patch"; + hash = "sha256-dXkY8Hha6y9CoZC1WdtZuI/YJsOQ1fOt4o4RsPkGWYQ="; + }) + ]; + # Fix ctypes finding library # https://github.com/NixOS/nixpkgs/issues/7307 postPatch = lib.optionalString stdenv.isLinux '' |