Unverified Commit a45b9ccb authored by Emily Trau's avatar Emily Trau Committed by GitHub
Browse files

Merge pull request #267707 from katexochen/mkosi/19 

mkosi: 18 -> 19
parents 4204f4fa fdb0b82f

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

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ In addition to numerous new and upgraded packages, this release has the followin 


<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->



- Create the first release note entry in this section!

- `mkosi` was updated to v19. Parts of the user interface have changed. Consult the

  [release notes](https://github.com/systemd/mkosi/releases/tag/v19) for a list of changes.



## Other Notable Changes {#sec-release-24.05-notable-changes}

pkgs/tools/virtualization/mkosi/default.nix

+22 −9
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
, python3

, bubblewrap

, systemd

, pandoc



  # Python packages

, setuptools
@@ -60,14 +61,16 @@ let 
in

buildPythonApplication rec {

  pname = "mkosi";

  version = "18";

  version = "19";

  format = "pyproject";



  outputs = [ "out" "man" ];



  src = fetchFromGitHub {

    owner = "systemd";

    repo = "mkosi";

    rev = "v${version}";

    hash = "sha256-bnd2P6lq1XqKed3m4hDYrR9IcdrPaJxNBL2Z6jCruV4=";

    hash = "sha256-KjJM+KZCgUnsaEN2ZorhH0AR5nmiV2h3i7Vb3KdGFtI=";

  };



  # Fix ctypes finding library
@@ -84,15 +87,12 @@ buildPythonApplication rec { 
  '';



  nativeBuildInputs = [

    pandoc

    setuptools

    setuptools-scm

    wheel

  ];



  makeWrapperArgs = [

    "--set MKOSI_INTERPRETER ${python3pefile}/bin/python3"

  ];



  propagatedBuildInputs = [

    systemdForMkosi

    bubblewrap
@@ -100,15 +100,28 @@ buildPythonApplication rec { 
    qemu

  ];



  postInstall = ''

    wrapProgram $out/bin/mkosi \

      --prefix PYTHONPATH : "$PYTHONPATH"

  postBuild = ''

    ./tools/make-man-page.sh

  '';



  checkInputs = [

    pytestCheckHook

  ];



  pythonImportsCheck = [

    "mkosi"

  ];



  postInstall = ''

    mkdir -p $out/share/man/man1

    mv mkosi/resources/mkosi.1 $out/share/man/man1/

  '';



  makeWrapperArgs = [

    "--set MKOSI_INTERPRETER ${python3pefile}/bin/python3"

    "--prefix PYTHONPATH : \"$PYTHONPATH\""

  ];



  meta = with lib; {

    description = "Build legacy-free OS images";

    homepage = "https://github.com/systemd/mkosi";