Unverified Commit d599106f authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents be8c1707 12769bc7

pkgs/applications/version-management/commitizen/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ buildPythonApplication rec { 
    owner = "commitizen-tools";

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-ZFKUG8dE1hpWPGitdQlYeBSzWn3LPR7VGWsuq1Le5OQ=";

    sha256 = "sha256-7S676bpSrlAqpbgDj9nAo0WjeitbbHoYc693MJm35Js=";

    deepClone = true;

  };

pkgs/applications/virtualization/virt-manager/default.nix

+18 −16
Original line number Diff line number Diff line 
{ lib, fetchurl, python3Packages, intltool, file

, wrapGAppsHook, gtk-vnc, vte, avahi, dconf

, gobject-introspection, libvirt-glib, system-libvirt

, gsettings-desktop-schemas, libosinfo, gnome

, gtksourceview4, docutils

{ lib, fetchFromGitHub, python3, intltool, file, wrapGAppsHook, gtk-vnc

, vte, avahi, dconf, gobject-introspection, libvirt-glib, system-libvirt

, gsettings-desktop-schemas, libosinfo, gnome, gtksourceview4, docutils, cpio

, e2fsprogs, findutils, gzip, cdrtools

, spiceSupport ? true, spice-gtk ? null

, cpio, e2fsprogs, findutils, gzip

, cdrtools

}:



with lib;



python3Packages.buildPythonApplication rec {

python3.pkgs.buildPythonApplication rec {

  pname = "virt-manager";

  version = "3.2.0";

  version = "4.0.0";



  src = fetchurl {

    url = "https://releases.pagure.org/virt-manager/${pname}-${version}.tar.gz";

    sha256 = "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb";

  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = "v${version}";

    hash = "sha256-3ycXNBuf91kI2cJCRw0ZzaWkaIVwb/lmkOKeHNwpH9Y=";

  };



  nativeBuildInputs = [
@@ -32,7 +31,7 @@ python3Packages.buildPythonApplication rec { 
    gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943

  ] ++ optional spiceSupport spice-gtk;



  propagatedBuildInputs = with python3Packages; [

  propagatedBuildInputs = with python3.pkgs; [

    pygobject3 ipaddress libvirt libxml2 requests cdrtools

  ];
@@ -42,14 +41,17 @@ python3Packages.buildPythonApplication rec { 
  '';



  postConfigure = ''

    ${python3Packages.python.interpreter} setup.py configure --prefix=$out

    ${python3.interpreter} setup.py configure --prefix=$out

  '';



  setupPyGlobalFlags = [ "--no-update-icon-cache" ];

  setupPyGlobalFlags = [ "--no-update-icon-cache" "--no-compile-schemas" ];



  dontWrapGApps = true;



  preFixup = ''

    mkdir -p $out/share/glib-2.0/schemas

    cp $src/data/*.gschema.xml $out/share/glib-2.0/schemas/



    gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH")

    # these are called from virt-install in initrdinject.py

    gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}")
@@ -57,7 +59,7 @@ python3Packages.buildPythonApplication rec { 
    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")

  '';



  checkInputs = with python3Packages; [ cpio cdrtools pytestCheckHook ];

  checkInputs = with python3.pkgs; [ cpio cdrtools pytestCheckHook ];



  disabledTestPaths = [

    "tests/test_cli.py"

pkgs/tools/admin/fits-cloudctl/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 


buildGoModule rec {

  pname = "fits-cloudctl";

  version = "0.10.10";

  version = "0.10.11";



  src = fetchFromGitHub {

    owner = "fi-ts";

    repo = "cloudctl";

    rev = "v${version}";

    sha256 = "sha256-US3Wvr6uBwsaIqjsbWeZtYucXVybMjKu8AuPYvykCvA=";

    sha256 = "sha256-hGKnQk2OPpHsjbRh/xx3MidbUMio6tYn+oJB0t1a/yM=";

  };



  vendorSha256 = "sha256-f35Asf9l6ZfixpjMGzesTsxmANreilMxH2CULMH3b2o=";

pkgs/tools/inputmethods/fcitx5/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -41,13 +41,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "fcitx5";

  version = "5.0.14";

  version = "5.0.15";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = pname;

    rev = version;

    sha256 = "sha256-Trpye+jTu+l8ieUK6IX+ZqNe4H2DvoJ10juiMkEGRKM=";

    sha256 = "sha256-+9MmYyMP6oqtToTsvcCMlNnKU0ZZtHYtI4YFXb7DuXU=";

  };



  prePatch = ''

pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix

+2 −2
Original line number Diff line number Diff line
@@ -10,13 +10,13 @@ 


stdenv.mkDerivation rec {

  pname = "fcitx5-chewing";

  version = "5.0.9";

  version = "5.0.10";



  src = fetchFromGitHub {

    owner = "fcitx";

    repo = pname;

    rev = version;

    sha256 = "sha256-wPfod0BNvNy1gwSJyu7N0sS61StnmXLrMNFgmHk9A0M=";

    sha256 = "sha256-KZ3RZ/1Pt+/eNjJ8KSSgwl1MuB1OdGGb0Kwz6hpkxPY=";

  };



  nativeBuildInputs = [